diff --git a/app/sdks/console-javascript/src/sdk.js b/app/sdks/console-javascript/src/sdk.js index fdd2a84cd0..65a47ecdfa 100644 --- a/app/sdks/console-javascript/src/sdk.js +++ b/app/sdks/console-javascript/src/sdk.js @@ -1652,14 +1652,13 @@ * * @param {string} name * @param {object} vars - * @param {string} trigger * @param {string[]} events * @param {string} schedule * @param {number} timeout * @throws {Error} * @return {Promise} */ - create: function(name, vars = [], trigger = 'event', events = [], schedule = '', timeout = 10) { + create: function(name, vars = [], events = [], schedule = '', timeout = 15) { if(name === undefined) { throw new Error('Missing required parameter: "name"'); } @@ -1676,10 +1675,6 @@ payload['vars'] = vars; } - if(trigger) { - payload['trigger'] = trigger; - } - if(events) { payload['events'] = events; } @@ -1728,14 +1723,13 @@ * @param {string} functionId * @param {string} name * @param {object} vars - * @param {string} trigger * @param {string[]} events * @param {string} schedule * @param {number} timeout * @throws {Error} * @return {Promise} */ - update: function(functionId, name, vars = [], trigger = 'event', events = [], schedule = '', timeout = 10) { + update: function(functionId, name, vars = [], events = [], schedule = '', timeout = 15) { if(functionId === undefined) { throw new Error('Missing required parameter: "functionId"'); } @@ -1756,10 +1750,6 @@ payload['vars'] = vars; } - if(trigger) { - payload['trigger'] = trigger; - } - if(events) { payload['events'] = events; } diff --git a/app/sdks/console-javascript/src/sdk.min.js b/app/sdks/console-javascript/src/sdk.min.js index 0d1539834c..e2cb17f33d 100644 --- a/app/sdks/console-javascript/src/sdk.min.js +++ b/app/sdks/console-javascript/src/sdk.min.js @@ -137,19 +137,17 @@ let path='/database/collections/{collectionId}/logs'.replace(new RegExp('{collec if(limit){payload.limit=limit} if(offset){payload.offset=offset} if(orderType){payload.orderType=orderType} -return http.get(path,{'content-type':'application/json',},payload)},create:function(name,vars=[],trigger='event',events=[],schedule='',timeout=10){if(name===undefined){throw new Error('Missing required parameter: "name"')} +return http.get(path,{'content-type':'application/json',},payload)},create:function(name,vars=[],events=[],schedule='',timeout=15){if(name===undefined){throw new Error('Missing required parameter: "name"')} let path='/functions';let payload={};if(name){payload.name=name} if(vars){payload.vars=vars} -if(trigger){payload.trigger=trigger} if(events){payload.events=events} if(schedule){payload.schedule=schedule} if(timeout){payload.timeout=timeout} return http.post(path,{'content-type':'application/json',},payload)},get:function(functionId){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')} -let path='/functions/{functionId}'.replace(new RegExp('{functionId}','g'),functionId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},update:function(functionId,name,vars=[],trigger='event',events=[],schedule='',timeout=10){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')} +let path='/functions/{functionId}'.replace(new RegExp('{functionId}','g'),functionId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},update:function(functionId,name,vars=[],events=[],schedule='',timeout=15){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')} if(name===undefined){throw new Error('Missing required parameter: "name"')} let path='/functions/{functionId}'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(name){payload.name=name} if(vars){payload.vars=vars} -if(trigger){payload.trigger=trigger} if(events){payload.events=events} if(schedule){payload.schedule=schedule} if(timeout){payload.timeout=timeout} diff --git a/app/sdks/console-javascript/types/index.d.ts b/app/sdks/console-javascript/types/index.d.ts index 260272f34d..009bcdf4fc 100644 --- a/app/sdks/console-javascript/types/index.d.ts +++ b/app/sdks/console-javascript/types/index.d.ts @@ -611,14 +611,13 @@ declare namespace Appwrite { * * @param {string} name * @param {object} vars - * @param {string} trigger * @param {string[]} events * @param {string} schedule * @param {number} timeout * @throws {Error} * @return {Promise} */ - create(name: string, vars: object, trigger: string, events: string[], schedule: string, timeout: number): Promise; + create(name: string, vars: object, events: string[], schedule: string, timeout: number): Promise; /** * Get Function @@ -637,14 +636,13 @@ declare namespace Appwrite { * @param {string} functionId * @param {string} name * @param {object} vars - * @param {string} trigger * @param {string[]} events * @param {string} schedule * @param {number} timeout * @throws {Error} * @return {Promise} */ - update(functionId: string, name: string, vars: object, trigger: string, events: string[], schedule: string, timeout: number): Promise; + update(functionId: string, name: string, vars: object, events: string[], schedule: string, timeout: number): Promise; /** * Delete Function diff --git a/app/sdks/server-go/docs/examples/functions/create.md b/app/sdks/server-go/docs/examples/functions/create.md index 0700566d7b..a87a23b944 100644 --- a/app/sdks/server-go/docs/examples/functions/create.md +++ b/app/sdks/server-go/docs/examples/functions/create.md @@ -15,7 +15,7 @@ func main() { client: &client } - var response, error := service.Create("[NAME]", , "event", [], "", 1) + var response, error := service.Create("[NAME]", , [], "", 0) if error != nil { panic(error) diff --git a/app/sdks/server-go/docs/examples/functions/update.md b/app/sdks/server-go/docs/examples/functions/update.md index eaa7e4bf4d..0f8f9e0190 100644 --- a/app/sdks/server-go/docs/examples/functions/update.md +++ b/app/sdks/server-go/docs/examples/functions/update.md @@ -15,7 +15,7 @@ func main() { client: &client } - var response, error := service.Update("[FUNCTION_ID]", "[NAME]", , "event", [], "", 1) + var response, error := service.Update("[FUNCTION_ID]", "[NAME]", , [], "", 0) if error != nil { panic(error) diff --git a/app/sdks/server-go/functions.go b/app/sdks/server-go/functions.go index c79083fafb..3f82eb1fb2 100644 --- a/app/sdks/server-go/functions.go +++ b/app/sdks/server-go/functions.go @@ -32,13 +32,12 @@ func (srv *Functions) List(Search string, Limit int, Offset int, OrderType strin } // Create -func (srv *Functions) Create(Name string, Vars object, Trigger string, Events []interface{}, Schedule string, Timeout int) (map[string]interface{}, error) { +func (srv *Functions) Create(Name string, Vars object, Events []interface{}, Schedule string, Timeout int) (map[string]interface{}, error) { path := "/functions" params := map[string]interface{}{ "name": Name, "vars": Vars, - "trigger": Trigger, "events": Events, "schedule": Schedule, "timeout": Timeout, @@ -59,14 +58,13 @@ func (srv *Functions) Get(FunctionId string) (map[string]interface{}, error) { } // Update -func (srv *Functions) Update(FunctionId string, Name string, Vars object, Trigger string, Events []interface{}, Schedule string, Timeout int) (map[string]interface{}, error) { +func (srv *Functions) Update(FunctionId string, Name string, Vars object, Events []interface{}, Schedule string, Timeout int) (map[string]interface{}, error) { r := strings.NewReplacer("{functionId}", FunctionId) path := r.Replace("/functions/{functionId}") params := map[string]interface{}{ "name": Name, "vars": Vars, - "trigger": Trigger, "events": Events, "schedule": Schedule, "timeout": Timeout, diff --git a/app/sdks/server-java/src/main/java/services/Functions.java b/app/sdks/server-java/src/main/java/services/Functions.java index 3f79965d50..a04ad1b5a9 100644 --- a/app/sdks/server-java/src/main/java/services/Functions.java +++ b/app/sdks/server-java/src/main/java/services/Functions.java @@ -39,13 +39,12 @@ public class Functions extends Service { } /// Create Function - public Call create(String name, Object vars, String trigger, List events, String schedule, int timeout) { + public Call create(String name, Object vars, List events, String schedule, int timeout) { final String path = "/functions"; final Map params = Map.ofEntries( entry("name", name), entry("vars", vars), - entry("trigger", trigger), entry("events", events), entry("schedule", schedule), entry("timeout", timeout) @@ -77,13 +76,12 @@ public class Functions extends Service { } /// Update Function - public Call update(String functionId, String name, Object vars, String trigger, List events, String schedule, int timeout) { + public Call update(String functionId, String name, Object vars, List events, String schedule, int timeout) { final String path = "/functions/{functionId}".replace("{functionId}", functionId); final Map params = Map.ofEntries( entry("name", name), entry("vars", vars), - entry("trigger", trigger), entry("events", events), entry("schedule", schedule), entry("timeout", timeout) diff --git a/app/sdks/server-nodejs/lib/services/functions.js b/app/sdks/server-nodejs/lib/services/functions.js index ab93f0f403..0dfd8d945d 100644 --- a/app/sdks/server-nodejs/lib/services/functions.js +++ b/app/sdks/server-nodejs/lib/services/functions.js @@ -31,14 +31,13 @@ class Functions extends Service { * * @param string name * @param object vars - * @param string trigger * @param string[] events * @param string schedule * @param number timeout * @throws Exception * @return {} */ - async create(name, vars = [], trigger = 'event', events = [], schedule = '', timeout = 10) { + async create(name, vars = [], events = [], schedule = '', timeout = 15) { let path = '/functions'; return await this.client.call('post', path, { @@ -47,7 +46,6 @@ class Functions extends Service { { 'name': name, 'vars': vars, - 'trigger': trigger, 'events': events, 'schedule': schedule, 'timeout': timeout @@ -77,14 +75,13 @@ class Functions extends Service { * @param string functionId * @param string name * @param object vars - * @param string trigger * @param string[] events * @param string schedule * @param number timeout * @throws Exception * @return {} */ - async update(functionId, name, vars = [], trigger = 'event', events = [], schedule = '', timeout = 10) { + async update(functionId, name, vars = [], events = [], schedule = '', timeout = 15) { let path = '/functions/{functionId}'.replace(new RegExp('{functionId}', 'g'), functionId); return await this.client.call('put', path, { @@ -93,7 +90,6 @@ class Functions extends Service { { 'name': name, 'vars': vars, - 'trigger': trigger, 'events': events, 'schedule': schedule, 'timeout': timeout diff --git a/app/sdks/server-php/docs/functions.md b/app/sdks/server-php/docs/functions.md index 91c86a40b2..39e28d55b8 100644 --- a/app/sdks/server-php/docs/functions.md +++ b/app/sdks/server-php/docs/functions.md @@ -27,10 +27,9 @@ POST https://appwrite.io/v1/functions | --- | --- | --- | --- | | name | string | Function name. | | | vars | object | Key-value JSON object. | [] | -| trigger | string | Function trigger type. | event | | events | array | Events list. | [] | | schedule | string | Schedule CRON syntax. | | -| timeout | integer | Function maximum execution time in seconds. | 10 | +| timeout | integer | Function maximum execution time in seconds. | 15 | ## Get Function @@ -57,10 +56,9 @@ PUT https://appwrite.io/v1/functions/{functionId} | functionId | string | **Required** Function unique ID. | | | name | string | Function name. | | | vars | object | Key-value JSON object. | [] | -| trigger | string | Function trigger type. | event | | events | array | Events list. | [] | | schedule | string | Schedule CRON syntax. | | -| timeout | integer | Function maximum execution time in seconds. | 10 | +| timeout | integer | Function maximum execution time in seconds. | 15 | ## Delete Function diff --git a/app/sdks/server-php/src/Appwrite/Services/Functions.php b/app/sdks/server-php/src/Appwrite/Services/Functions.php index 4403fac693..1771652072 100644 --- a/app/sdks/server-php/src/Appwrite/Services/Functions.php +++ b/app/sdks/server-php/src/Appwrite/Services/Functions.php @@ -38,21 +38,19 @@ class Functions extends Service * * @param string $name * @param array $vars - * @param string $trigger * @param array $events * @param string $schedule * @param int $timeout * @throws Exception * @return array */ - public function create(string $name, array $vars = , string $trigger = 'event', array $events = [], string $schedule = '', int $timeout = 10):array + public function create(string $name, array $vars = , array $events = [], string $schedule = '', int $timeout = 15):array { $path = str_replace([], [], '/functions'); $params = []; $params['name'] = $name; $params['vars'] = $vars; - $params['trigger'] = $trigger; $params['events'] = $events; $params['schedule'] = $schedule; $params['timeout'] = $timeout; @@ -86,21 +84,19 @@ class Functions extends Service * @param string $functionId * @param string $name * @param array $vars - * @param string $trigger * @param array $events * @param string $schedule * @param int $timeout * @throws Exception * @return array */ - public function update(string $functionId, string $name, array $vars = , string $trigger = 'event', array $events = [], string $schedule = '', int $timeout = 10):array + public function update(string $functionId, string $name, array $vars = , array $events = [], string $schedule = '', int $timeout = 15):array { $path = str_replace(['{functionId}'], [$functionId], '/functions/{functionId}'); $params = []; $params['name'] = $name; $params['vars'] = $vars; - $params['trigger'] = $trigger; $params['events'] = $events; $params['schedule'] = $schedule; $params['timeout'] = $timeout; diff --git a/app/sdks/server-python/appwrite/services/functions.py b/app/sdks/server-python/appwrite/services/functions.py index fb149e3546..1688f21f47 100644 --- a/app/sdks/server-python/appwrite/services/functions.py +++ b/app/sdks/server-python/appwrite/services/functions.py @@ -20,14 +20,13 @@ class Functions(Service): 'content-type': 'application/json', }, params) - def create(self, name, vars=[], trigger='event', events=[], schedule='', timeout=10): + def create(self, name, vars=[], events=[], schedule='', timeout=15): """Create Function""" params = {} path = '/functions' params['name'] = name params['vars'] = vars - params['trigger'] = trigger params['events'] = events params['schedule'] = schedule params['timeout'] = timeout @@ -47,7 +46,7 @@ class Functions(Service): 'content-type': 'application/json', }, params) - def update(self, function_id, name, vars=[], trigger='event', events=[], schedule='', timeout=10): + def update(self, function_id, name, vars=[], events=[], schedule='', timeout=15): """Update Function""" params = {} @@ -55,7 +54,6 @@ class Functions(Service): path = path.replace('{functionId}', function_id) params['name'] = name params['vars'] = vars - params['trigger'] = trigger params['events'] = events params['schedule'] = schedule params['timeout'] = timeout diff --git a/app/sdks/server-ruby/lib/appwrite/services/functions.rb b/app/sdks/server-ruby/lib/appwrite/services/functions.rb index 7821d5a87c..e6fb0c5f12 100644 --- a/app/sdks/server-ruby/lib/appwrite/services/functions.rb +++ b/app/sdks/server-ruby/lib/appwrite/services/functions.rb @@ -16,13 +16,12 @@ module Appwrite }, params); end - def create(name:, vars: [], trigger: 'event', events: [], schedule: '', timeout: 10) + def create(name:, vars: [], events: [], schedule: '', timeout: 15) path = '/functions' params = { 'name': name, 'vars': vars, - 'trigger': trigger, 'events': events, 'schedule': schedule, 'timeout': timeout @@ -45,14 +44,13 @@ module Appwrite }, params); end - def update(function_id:, name:, vars: [], trigger: 'event', events: [], schedule: '', timeout: 10) + def update(function_id:, name:, vars: [], events: [], schedule: '', timeout: 15) path = '/functions/{functionId}' .gsub('{function_id}', function_id) params = { 'name': name, 'vars': vars, - 'trigger': trigger, 'events': events, 'schedule': schedule, 'timeout': timeout