alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes async payload passing for #68.

Browse Source
This commit is contained in:
Travis Reeder
2017-06-20 11:32:51 -07:00
parent c94dab3d45
commit 8c96d3ba2f
23 changed files with 276 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
api/models/new_task.go
View File

@@ -1,100 +0,0 @@
package models
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the swagger generate command
import (
strfmt "github.com/go-openapi/strfmt"
"github.com/go-openapi/errors"
"github.com/go-openapi/validate"
)
/*NewTask new task
swagger:model NewTask
*/
type NewTask struct {
/* Number of seconds to wait before queueing the task for consumption for the first time. Must be a positive integer. Tasks with a delay start in state "delayed" and transition to "running" after delay seconds.
*/
Delay int32 `json:"delay,omitempty"`
/* Name of Docker image to use. This is optional and can be used to override the image defined at the route level.
Required: true
*/
Image *string `json:"image"`
/* "Number of automatic retries this task is allowed. A retry will be attempted if a task fails. Max 25. Automatic retries are performed by titan when a task reaches a failed state and has `max_retries` > 0. A retry is performed by queueing a new task with the same image id and payload. The new task's max_retries is one less than the original. The new task's `retry_of` field is set to the original Task ID. The old task's `retry_at` field is set to the new Task's ID. Titan will delay the new task for retries_delay seconds before queueing it. Cancelled or successful tasks are never automatically retried."
*/
MaxRetries int32 `json:"max_retries,omitempty"`
/* Payload for the task. This is what you pass into each task to make it do something.
*/
Payload string `json:"payload,omitempty"`
/* Priority of the task. Higher has more priority. 3 levels from 0-2. Tasks at same priority are processed in FIFO order.
Required: true
*/
Priority *int32 `json:"priority"`
/* Time in seconds to wait before retrying the task. Must be a non-negative integer.
*/
RetriesDelay *int32 `json:"retries_delay,omitempty"`
/* Maximum runtime in seconds. If a consumer retrieves the
task, but does not change it's status within timeout seconds, the task
is considered failed, with reason timeout (Titan may allow a small
grace period). The consumer should also kill the task after timeout
seconds. If a consumer tries to change status after Titan has already
timed out the task, the consumer will be ignored.
*/
Timeout *int32 `json:"timeout,omitempty"`
/* Hot function idle timeout in seconds before termination.
*/
IdleTimeout *int32 `json:"idle_timeout,omitempty"`
}
// Validate validates this new task
func (m *NewTask) Validate(formats strfmt.Registry) error {
var res []error
if err := m.validateImage(formats); err != nil {
// prop
res = append(res, err)
}
if err := m.validatePriority(formats); err != nil {
// prop
res = append(res, err)
}
if len(res) > 0 {
return errors.CompositeValidationError(res...)
}
return nil
}
func (m *NewTask) validateImage(formats strfmt.Registry) error {
if err := validate.Required("image", "body", m.Image); err != nil {
return err
}
return nil
}
func (m *NewTask) validatePriority(formats strfmt.Registry) error {
if err := validate.Required("priority", "body", m.Priority); err != nil {
return err
}
return nil
}

73
api/models/task.go
View File

@@ -31,23 +31,22 @@ const (
type FnCall struct { type FnCall struct {
IDStatus IDStatus
CompletedAt strfmt.DateTime `json:"completed_at,omitempty"` CompletedAt strfmt.DateTime `json:"completed_at,omitempty"`
CreatedAt strfmt.DateTime `json:"created_at,omitempty"` CreatedAt strfmt.DateTime `json:"created_at,omitempty"`
StartedAt strfmt.DateTime `json:"started_at,omitempty"` StartedAt strfmt.DateTime `json:"started_at,omitempty"`
AppName string `json:"app_name,omitempty"` AppName string `json:"app_name,omitempty"`
Path string `json:"path"` Path string `json:"path"`
} }
func (fnCall *FnCall) FromTask(task *Task) *FnCall { func (fnCall *FnCall) FromTask(task *Task) *FnCall {
return &FnCall{ return &FnCall{
CreatedAt:task.CreatedAt, CreatedAt: task.CreatedAt,
StartedAt:task.StartedAt, StartedAt: task.StartedAt,
CompletedAt:task.CompletedAt, CompletedAt: task.CompletedAt,
AppName:task.AppName, AppName: task.AppName,
Path:task.Path, Path: task.Path,
IDStatus: IDStatus{ IDStatus: IDStatus{
ID:task.ID, ID: task.ID,
Status:task.Status, Status: task.Status,
}, },
} }
} }
@@ -57,10 +56,52 @@ func (fnCall *FnCall) FromTask(task *Task) *FnCall {
swagger:model Task swagger:model Task
*/ */
type Task struct { type Task struct {
NewTask
IDStatus IDStatus
/* Number of seconds to wait before queueing the task for consumption for the first time. Must be a positive integer. Tasks with a delay start in state "delayed" and transition to "running" after delay seconds.
*/
Delay int32 `json:"delay,omitempty"`
/* Name of Docker image to use. This is optional and can be used to override the image defined at the route level.
Required: true
*/
Image *string `json:"image"`
/* "Number of automatic retries this task is allowed. A retry will be attempted if a task fails. Max 25. Automatic retries are performed by titan when a task reaches a failed state and has `max_retries` > 0. A retry is performed by queueing a new task with the same image id and payload. The new task's max_retries is one less than the original. The new task's `retry_of` field is set to the original Task ID. The old task's `retry_at` field is set to the new Task's ID. Titan will delay the new task for retries_delay seconds before queueing it. Cancelled or successful tasks are never automatically retried."
*/
MaxRetries int32 `json:"max_retries,omitempty"`
/* Payload for the task. This is what you pass into each task to make it do something.
*/
Payload string `json:"payload,omitempty"`
/* Priority of the task. Higher has more priority. 3 levels from 0-2. Tasks at same priority are processed in FIFO order.
Required: true
*/
Priority *int32 `json:"priority"`
/* Time in seconds to wait before retrying the task. Must be a non-negative integer.
*/
RetriesDelay *int32 `json:"retries_delay,omitempty"`
/* Maximum runtime in seconds. If a consumer retrieves the
task, but does not change it's status within timeout seconds, the task
is considered failed, with reason timeout (Titan may allow a small
grace period). The consumer should also kill the task after timeout
seconds. If a consumer tries to change status after Titan has already
timed out the task, the consumer will be ignored.
*/
Timeout *int32 `json:"timeout,omitempty"`
/* Hot function idle timeout in seconds before termination.
*/
IdleTimeout *int32 `json:"idle_timeout,omitempty"`
/* Time when task completed, whether it was successul or failed. Always in UTC. /* Time when task completed, whether it was successul or failed. Always in UTC.
*/ */
CompletedAt strfmt.DateTime `json:"completed_at,omitempty"` CompletedAt strfmt.DateTime `json:"completed_at,omitempty"`
@@ -116,9 +157,7 @@ type Task struct {
func (m *Task) Validate(formats strfmt.Registry) error { func (m *Task) Validate(formats strfmt.Registry) error {
var res []error var res []error
if err := m.NewTask.Validate(formats); err != nil { // NewTask validations will get generated automatically
res = append(res, err)
}
if err := m.IDStatus.Validate(formats); err != nil { if err := m.IDStatus.Validate(formats); err != nil {
res = append(res, err) res = append(res, err)

3
api/runner/async_runner.go
View File

@@ -127,7 +127,8 @@ func startAsyncRunners(ctx context.Context, url string, rnr *Runner, ds models.D
} }
ctx, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": task.ID}) ctx, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": task.ID})
log.Debug("Running task:", task.ID) log.Info("Running task:", task.ID)
// log.Infof("Task: %+v", task)
wg.Add(1) wg.Add(1)

5
api/runner/worker.go
View File

@@ -5,6 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"strings"
"sync" "sync"
"time" "time"
@@ -63,6 +64,10 @@ func (rnr *Runner) RunTrackedTask(newTask *models.Task, ctx context.Context, cfg
startedAt := strfmt.DateTime(time.Now()) startedAt := strfmt.DateTime(time.Now())
newTask.StartedAt = startedAt newTask.StartedAt = startedAt
// set payload as Stdin
// fmt.Printf("ABOUT TO PASS IN PAYLOAD: %v", newTask.Payload)
cfg.Stdin = strings.NewReader(newTask.Payload)
result, err := rnr.RunTask(ctx, cfg) result, err := rnr.RunTask(ctx, cfg)
completedAt := strfmt.DateTime(time.Now()) completedAt := strfmt.DateTime(time.Now())

2
api/server/routes_create.go
View File

@@ -90,7 +90,7 @@ func (s *Server) handleRouteCreate(c *gin.Context) {
return return
} }
s.cacherefresh(route) s.cacheRefresh(route)
c.JSON(http.StatusOK, routeResponse{"Route successfully created", route}) c.JSON(http.StatusOK, routeResponse{"Route successfully created", route})
} }

4
api/server/routes_update.go
View File

@@ -36,6 +36,8 @@ func (s *Server) handleRouteUpdate(c *gin.Context) {
return return
} }
// fmt.Printf("ROUTE BOUND: %+v", *wroute.Route)
wroute.Route.AppName = c.MustGet(api.AppName).(string) wroute.Route.AppName = c.MustGet(api.AppName).(string)
wroute.Route.Path = path.Clean(c.MustGet(api.Path).(string)) wroute.Route.Path = path.Clean(c.MustGet(api.Path).(string))
@@ -69,7 +71,7 @@ func (s *Server) handleRouteUpdate(c *gin.Context) {
return return
} }
s.cacherefresh(route) s.cacheRefresh(route)
c.JSON(http.StatusOK, routeResponse{"Route successfully updated", route}) c.JSON(http.StatusOK, routeResponse{"Route successfully updated", route})
} }

2
api/server/server.go
View File

@@ -171,7 +171,7 @@ func (s *Server) cacheget(appname, path string) (*models.Route, bool) {
return route, ok return route, ok
} }
func (s *Server) cacherefresh(route *models.Route) { func (s *Server) cacheRefresh(route *models.Route) {
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock() defer s.mu.Unlock()
s.hotroutes.Refresh(route) s.hotroutes.Refresh(route)

1
docs/README.md
View File

@@ -13,6 +13,7 @@ If you are a developer using Oracle Functions through the API, this section is f
* [Open Function Format](function-format.md) * [Open Function Format](function-format.md)
* [API Reference](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/treeder/functions/master/docs/swagger.yml) * [API Reference](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/treeder/functions/master/docs/swagger.yml)
* [Hot functions](hot-functions.md) * [Hot functions](hot-functions.md)
* [Async functions](async.md)
* [FAQ](faq.md) * [FAQ](faq.md)
## For Operators ## For Operators

18
docs/async.md Normal file
View File

@@ -0,0 +1,18 @@
# Asynchronous Functions
Asynchronous (async) functions will run your function at some point in the future. The default mode is synchronous which means
a function is executed and the caller blocks while waiting for the response. Asynchronous on the other, puts the request into a
message queue and responds immediately to the caller. The function will then be executed at some point in the future, upon resource availability giving priority
to synchronous calls. Also, since it is using a message queue, you can safely queue up millions of function calls without worrying about
capacity.
Async will return immediately with a `call_id`, for example:
```json
{"call_id": "abc123"}
```
The `call_id` can then be used to retrieve the status at a later time.
Asynchronous function calls are great for tasks that are CPU heavy or take more than a few seconds to complete.
For instance, image processing, video processing, data processing, ETL, etc.

128
docs/swagger.yml
View File

@@ -555,58 +555,67 @@ definitions:
readOnly: true readOnly: true
Task: Task:
allOf: type: object
- $ref: "#/definitions/NewTask" required:
- type: object - image
properties: properties:
group_name: image:
type: string type: string
description: "Group this task belongs to." description: Name of Docker image to use. This is optional and can be used to override the image defined at the group level.
readOnly: true payload:
error: type: string
type: string # 256k
description: "The error message, if status is 'error'. This is errors due to things outside the task itself. Errors from user code will be found in the log." # maxLength breaks ruby generator too: https://github.com/treeder/worker_ruby/blob/0aa9236ce5060af3f15758937712973f80dd54fe/lib/iron_titan/models/task.rb#L272
reason: # maxLength: 268435456
type: string description: Payload for the task. This is what you pass into each task to make it do something.
description: | group_name:
Machine usable reason for task being in this state. type: string
Valid values for error status are `timeout | killed | bad_exit`. description: "Group this task belongs to."
Valid values for cancelled status are `client_request`. readOnly: true
For everything else, this is undefined. error:
enum: type: string
- timeout description: "The error message, if status is 'error'. This is errors due to things outside the task itself. Errors from user code will be found in the log."
- killed reason:
- bad_exit type: string
- client_request description: |
created_at: Machine usable reason for task being in this state.
type: string Valid values for error status are `timeout | killed | bad_exit`.
format: date-time Valid values for cancelled status are `client_request`.
description: Time when task was submitted. Always in UTC. For everything else, this is undefined.
readOnly: true enum:
started_at: - timeout
type: string - killed
format: date-time - bad_exit
description: Time when task started execution. Always in UTC. - client_request
completed_at: created_at:
type: string type: string
format: date-time format: date-time
description: Time when task completed, whether it was successul or failed. Always in UTC. description: Time when task was submitted. Always in UTC.
# We maintain a doubly linked list of the retried task to the readOnly: true
# original task. started_at:
retry_of: type: string
type: string format: date-time
description: If this field is set, then this task is a retry of the ID in this field. description: Time when task started execution. Always in UTC.
readOnly: true completed_at:
retry_at: type: string
type: string format: date-time
description: If this field is set, then this task was retried by the task referenced in this field. description: Time when task completed, whether it was successul or failed. Always in UTC.
readOnly: true # We maintain a doubly linked list of the retried task to the
env_vars: # original task.
# this is a map: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#model-with-mapdictionary-properties retry_of:
type: object type: string
description: Env vars for the task. Comes from the ones set on the Group. description: If this field is set, then this task is a retry of the ID in this field.
additionalProperties: readOnly: true
type: string retry_at:
type: string
description: If this field is set, then this task was retried by the task referenced in this field.
readOnly: true
env_vars:
# this is a map: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#model-with-mapdictionary-properties
type: object
description: Env vars for the task. Comes from the ones set on the Group.
additionalProperties:
type: string
ErrorBody: ErrorBody:
type: object type: object
@@ -624,21 +633,6 @@ definitions:
error: error:
$ref: '#/definitions/ErrorBody' $ref: '#/definitions/ErrorBody'
NewTask:
type: object
required:
- image
properties:
image:
type: string
description: Name of Docker image to use. This is optional and can be used to override the image defined at the group level.
payload:
type: string
# 256k
# maxLength breaks ruby generator too: https://github.com/treeder/worker_ruby/blob/0aa9236ce5060af3f15758937712973f80dd54fe/lib/iron_titan/models/task.rb#L272
# maxLength: 268435456
description: Payload for the task. This is what you pass into each task to make it do something.
TaskWrapper: TaskWrapper:
type: object type: object
required: required:

4
docs/usage.md
View File

@@ -87,7 +87,7 @@ You should see it say `Hello Johnny!` now instead of `Hello World!`.
Oracle Functions supports synchronous function calls like we just tried above, and asynchronous for background processing. Oracle Functions supports synchronous function calls like we just tried above, and asynchronous for background processing.
Asynchronous function calls are great for tasks that are CPU heavy or take more than a few seconds to complete. [Asynchronous functions](async.md) are great for tasks that are CPU heavy or take more than a few seconds to complete.
For instance, image processing, video processing, data processing, ETL, etc. For instance, image processing, video processing, data processing, ETL, etc.
Architecturally, the main difference between synchronous and asynchronous is that requests Architecturally, the main difference between synchronous and asynchronous is that requests
to asynchronous functions are put in a queue and executed on upon resource availability so that they do not interfere with the fast synchronous responses required for an API. to asynchronous functions are put in a queue and executed on upon resource availability so that they do not interfere with the fast synchronous responses required for an API.
@@ -106,6 +106,8 @@ curl -H "Content-Type: application/json" -X POST -d '{
}' http://localhost:8080/v1/apps/myapp/routes }' http://localhost:8080/v1/apps/myapp/routes
``` ```
or set `type: async` in your `func.yaml`.
Now if you request this route: Now if you request this route:
```sh ```sh

6
examples/tutorial/async/go/.gitignore vendored Normal file
View File

@@ -0,0 +1,6 @@
vendor/
/go
/app
/__uberscript__
func.yaml

28
examples/tutorial/async/go/README.md Normal file
View File

@@ -0,0 +1,28 @@
# Aynchronous Function Example
This is an example of an [asynchronous function](/docs/async.md).
### First, run the following commands:
```sh
# Initialize your function creating a func.yaml file
fn init --type async <DOCKERHUB_USERNAME>/hello-go-async
# Test your function. This will run inside a container exactly how it will on the server
fn run
# Now try with an input
cat sample.payload.json | fn run
# Deploy your functions to the Oracle Functions server (default localhost:8080)
# This will create a route to your function as well
fn deploy myapp
```
### Now call your function:
```sh
cat payload.json | fn call myapp hello-go-async
```
That's it!

27
examples/tutorial/async/go/func.go Normal file
View File

@@ -0,0 +1,27 @@
package main
import (
"encoding/json"
"fmt"
"log"
"os"
)
type Person struct {
Name string
}
func main() {
// b, err := ioutil.ReadAll(os.Stdin)
// if err != nil {
// log.Fatal(err)
// }
// fmt.Printf("BODY!!! %s", string(b))
p := &Person{Name: "World"}
json.NewDecoder(os.Stdin).Decode(p)
fmt.Printf("Hello %v!\n", p.Name)
log.Println("---> stderr goes to the server logs.")
}

3
examples/tutorial/async/go/sample.payload.json Normal file
View File

@@ -0,0 +1,3 @@
{
"name": "Johnny"
}

28
fn/calls.go
View File

@@ -1,12 +1,12 @@
package main package main
import ( import (
"fmt"
"context" "context"
"fmt"
"github.com/funcy/functions_go/models"
fnclient "github.com/funcy/functions_go/client" fnclient "github.com/funcy/functions_go/client"
apicall "github.com/funcy/functions_go/client/call" apicall "github.com/funcy/functions_go/client/call"
"github.com/funcy/functions_go/models"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@@ -40,14 +40,14 @@ func calls() cli.Command {
} }
func printCalls(calls []*models.Call) { func printCalls(calls []*models.Call) {
for _, call := range calls{ for _, call := range calls {
fmt.Println(fmt.Sprintf( fmt.Println(fmt.Sprintf(
"ID: %v\n" + "ID: %v\n"+
"App: %v\n" + "App: %v\n"+
"Route: %v\n" + "Route: %v\n"+
"Created At: %v\n" + "Created At: %v\n"+
"Started At: %v\n" + "Started At: %v\n"+
"Completed At: %v\n" + "Completed At: %v\n"+
"Status: %v\n", "Status: %v\n",
call.ID, call.AppName, call.Path, call.CreatedAt, call.ID, call.AppName, call.Path, call.CreatedAt,
call.StartedAt, call.CompletedAt, call.Status)) call.StartedAt, call.CompletedAt, call.Status))
@@ -55,17 +55,16 @@ func printCalls(calls []*models.Call) {
} }
func (call *callsCmd) get(ctx *cli.Context) error { func (call *callsCmd) get(ctx *cli.Context) error {
call_id := ctx.Args().Get(0) callID := ctx.Args().Get(0)
params := apicall.GetCallsCallParams{ params := apicall.GetCallsCallParams{
Call: call_id, Call: callID,
Context: context.Background(), Context: context.Background(),
} }
resp, err := call.client.Call.GetCallsCall(&params) resp, err := call.client.Call.GetCallsCall(&params)
if err != nil { if err != nil {
switch err.(type) { switch err.(type) {
case *apicall.GetCallsCallNotFound: case *apicall.GetCallsCallNotFound:
return fmt.Errorf("error: %v", err.( return fmt.Errorf("error: %v", err.(*apicall.GetCallsCallNotFound).Payload.Error.Message)
*apicall.GetCallsCallNotFound).Payload.Error.Message)
} }
return fmt.Errorf("unexpected error: %v", err) return fmt.Errorf("unexpected error: %v", err)
@@ -85,8 +84,7 @@ func (call *callsCmd) list(ctx *cli.Context) error {
if err != nil { if err != nil {
switch err.(type) { switch err.(type) {
case *apicall.GetCallsCallNotFound: case *apicall.GetCallsCallNotFound:
return fmt.Errorf("error: %v", err.( return fmt.Errorf("error: %v", err.(*apicall.GetCallsCallNotFound).Payload.Error.Message)
*apicall.GetCallsCallNotFound).Payload.Error.Message)
} }
return fmt.Errorf("unexpected error: %v", err) return fmt.Errorf("unexpected error: %v", err)

11
fn/deploy.go
View File

@@ -129,9 +129,8 @@ func (p *deploycmd) deploy(c *cli.Context, funcFilePath string) error {
if err != nil { if err != nil {
return err return err
} }
if funcfile.Path == nil || *funcfile.Path == "" { if funcfile.Path == "" {
dirName := "/" + path.Base(path.Dir(funcFilePath)) funcfile.Path = "/" + path.Base(path.Dir(funcFilePath))
funcfile.Path = &dirName
} }
if p.skippush { if p.skippush {
@@ -146,18 +145,18 @@ func (p *deploycmd) deploy(c *cli.Context, funcFilePath string) error {
} }
func (p *deploycmd) route(c *cli.Context, ff *funcfile) error { func (p *deploycmd) route(c *cli.Context, ff *funcfile) error {
fmt.Printf("Updating route, setting %s -> %s...", ff.Path, ff.Name) fmt.Printf("Updating route %s using image %s...\n", ff.Path, ff.FullName())
fmt.Printf("%+v\ntype: %v\n", ff, *ff.Type)
if err := resetBasePath(p.Configuration); err != nil { if err := resetBasePath(p.Configuration); err != nil {
return fmt.Errorf("error setting endpoint: %v", err) return fmt.Errorf("error setting endpoint: %v", err)
} }
routesCmd := routesCmd{client: apiClient()} routesCmd := routesCmd{client: apiClient()}
rt := &models.Route{} rt := &models.Route{}
if err := routeWithFuncFile(c, ff, rt); err != nil { if err := routeWithFuncFile(c, ff, rt); err != nil {
return fmt.Errorf("error getting route with funcfile: %s", err) return fmt.Errorf("error getting route with funcfile: %s", err)
} }
return routesCmd.patchRoute(c, p.appName, *ff.Path, rt) return routesCmd.patchRoute(c, p.appName, ff.Path, rt)
} }
func expandEnvConfig(configs map[string]string) map[string]string { func expandEnvConfig(configs map[string]string) map[string]string {

2
fn/funcfile.go
View File

@@ -45,7 +45,7 @@ type funcfile struct {
Config map[string]string `yaml:"config,omitempty" json:"config,omitempty"` Config map[string]string `yaml:"config,omitempty" json:"config,omitempty"`
Build []string `yaml:"build,omitempty" json:"build,omitempty"` Build []string `yaml:"build,omitempty" json:"build,omitempty"`
Tests []fftest `yaml:"tests,omitempty" json:"tests,omitempty"` Tests []fftest `yaml:"tests,omitempty" json:"tests,omitempty"`
Path *string `yaml:"path,omitempty" json:"path,omitempty"` Path string `yaml:"path,omitempty" json:"path,omitempty"`
} }
func (ff *funcfile) FullName() string { func (ff *funcfile) FullName() string {

13
fn/init.go
View File

@@ -50,6 +50,7 @@ type initFnCmd struct {
entrypoint string entrypoint string
cmd string cmd string
format string format string
typeS string
} }
func initFn() cli.Command { func initFn() cli.Command {
@@ -83,6 +84,12 @@ func initFn() cli.Command {
Destination: &a.format, Destination: &a.format,
Value: "", Value: "",
}, },
cli.StringFlag{
Name: "type",
Usage: "sync or async",
Destination: &a.typeS,
Value: "",
},
}, },
} }
} }
@@ -124,10 +131,14 @@ func (a *initFnCmd) init(c *cli.Context) error {
Entrypoint: a.entrypoint, Entrypoint: a.entrypoint,
Cmd: a.cmd, Cmd: a.cmd,
Format: ffmt, Format: ffmt,
Type: &a.typeS,
}
if ff.Type != nil && *ff.Type == "" {
ff.Type = nil
} }
_, path := appNamePath(ff.FullName()) _, path := appNamePath(ff.FullName())
ff.Path = &path ff.Path = path
if err := encodeFuncfileYAML("func.yaml", ff); err != nil { if err := encodeFuncfileYAML("func.yaml", ff); err != nil {
return err return err

2
fn/lambda.go
View File

@@ -180,7 +180,7 @@ func createFunctionYaml(opts createImageOptions, functionName string) error {
funcDesc := &funcfile{ funcDesc := &funcfile{
Name: opts.Name, Name: opts.Name,
Path: &path, Path: path,
Config: opts.Config, Config: opts.Config,
Version: "0.0.1", Version: "0.0.1",
Runtime: &opts.Base, Runtime: &opts.Base,

8
fn/routes.go
View File

@@ -296,9 +296,13 @@ func routeWithFuncFile(c *cli.Context, ff *funcfile, rt *fnmodels.Route) error {
to := int32(ff.Timeout.Seconds()) to := int32(ff.Timeout.Seconds())
rt.Timeout = &to rt.Timeout = &to
} }
if rt.Path == "" && ff.Path != nil { if rt.Path == "" && ff.Path != "" {
rt.Path = *ff.Path rt.Path = ff.Path
} }
if rt.Type == nil && ff.Type != nil && *ff.Type != "" {
rt.Type = *ff.Type
}
return nil return nil
} }

24
fn/run.go
View File

@@ -48,22 +48,28 @@ func (r *runCmd) run(c *cli.Context) error {
if err != nil { if err != nil {
return err return err
} }
var ff *funcfile
// if image name is passed in, it will run that image
image := c.Args().First() image := c.Args().First()
if image == "" { if image == "" {
ff, err := loadFuncfile() ff, err = loadFuncfile()
if err != nil { if err != nil {
if _, ok := err.(*notFoundError); ok { if _, ok := err.(*notFoundError); ok {
return errors.New("error: image name is missing or no function file found") return errors.New("error: image name is missing or no function file found")
} }
return err return err
} }
image = ff.FullName() } else {
ff = &funcfile{
Name: image,
}
} }
return runff(image, stdin(), os.Stdout, os.Stderr, c.String("method"), c.StringSlice("e"), c.StringSlice("link")) return runff(ff, stdin(), os.Stdout, os.Stderr, c.String("method"), c.StringSlice("e"), c.StringSlice("link"))
} }
func runff(image string, stdin io.Reader, stdout, stderr io.Writer, method string, envVars []string, links []string) error { // TODO: THIS SHOULD USE THE RUNNER DRIVERS FROM THE SERVER SO IT'S ESSENTIALLY THE SAME PROCESS (MINUS DATABASE AND ALL THAT)
func runff(ff *funcfile, stdin io.Reader, stdout, stderr io.Writer, method string, envVars []string, links []string) error {
sh := []string{"docker", "run", "--rm", "-i"} sh := []string{"docker", "run", "--rm", "-i"}
var env []string // env for the shelled out docker run command var env []string // env for the shelled out docker run command
@@ -80,7 +86,7 @@ func runff(image string, stdin io.Reader, stdout, stderr io.Writer, method strin
runEnv = append(runEnv, kvEq("METHOD", method)) runEnv = append(runEnv, kvEq("METHOD", method))
runEnv = append(runEnv, kvEq("REQUEST_URL", "http://localhost:8080/myapp/hello")) runEnv = append(runEnv, kvEq("REQUEST_URL", "http://localhost:8080/myapp/hello"))
runEnv = append(runEnv, kvEq("APP_NAME", "myapp")) runEnv = append(runEnv, kvEq("APP_NAME", "myapp"))
runEnv = append(runEnv, kvEq("ROUTE", "/hello")) runEnv = append(runEnv, kvEq("ROUTE", "/hello")) // TODO: should we change this to PATH ?
// add user defined envs // add user defined envs
runEnv = append(runEnv, envVars...) runEnv = append(runEnv, envVars...)
@@ -97,7 +103,13 @@ func runff(image string, stdin io.Reader, stdout, stderr io.Writer, method strin
sh = append(sh, "-e", e) sh = append(sh, "-e", e)
} }
sh = append(sh, image) if ff.Type != nil && *ff.Type == "async" {
// if async, we'll run this in a separate thread and wait for it to complete
// reqID := id.New().String()
// I'm starting to think maybe `fn run` locally should work the same whether sync or async? Or how would we allow to test the output?
}
sh = append(sh, ff.FullName())
cmd := exec.Command(sh[0], sh[1:]...) cmd := exec.Command(sh[0], sh[1:]...)
cmd.Stdin = stdin cmd.Stdin = stdin
cmd.Stdout = stdout cmd.Stdout = stdout

9
fn/testfn.go
View File

@@ -68,8 +68,8 @@ func (t *testcmd) test(c *cli.Context) error {
target := ff.FullName() target := ff.FullName()
runtest := runlocaltest runtest := runlocaltest
if t.remote != "" { if t.remote != "" {
if ff.Path == nil || *ff.Path == "" { if ff.Path == "" {
return errors.New("execution of tests on remote server demand that this function to have a `path`.") return errors.New("execution of tests on remote server demand that this function has a `path`.")
} }
if err := resetBasePath(t.Configuration); err != nil { if err := resetBasePath(t.Configuration); err != nil {
return fmt.Errorf("error setting endpoint: %v", err) return fmt.Errorf("error setting endpoint: %v", err)
@@ -80,7 +80,7 @@ func (t *testcmd) test(c *cli.Context) error {
} }
u, err := url.Parse("../") u, err := url.Parse("../")
u.Path = path.Join(u.Path, "r", t.remote, *ff.Path) u.Path = path.Join(u.Path, "r", t.remote, ff.Path)
target = baseURL.ResolveReference(u).String() target = baseURL.ResolveReference(u).String()
runtest = runremotetest runtest = runremotetest
} }
@@ -134,7 +134,8 @@ func runlocaltest(target string, in, expectedOut, expectedErr *string, env map[s
restrictedEnv = append(restrictedEnv, k) restrictedEnv = append(restrictedEnv, k)
} }
if err := runff(target, stdin, &stdout, &stderr, "", restrictedEnv, nil); err != nil { ff := &funcfile{Name: target}
if err := runff(ff, stdin, &stdout, &stderr, "", restrictedEnv, nil); err != nil {
return fmt.Errorf("%v\nstdout:%s\nstderr:%s\n", err, stdout.String(), stderr.String()) return fmt.Errorf("%v\nstdout:%s\nstderr:%s\n", err, stdout.String(), stderr.String())
} }