mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
6a7973e6b6
the mqs are storing a models.Task, which was not incorporating all the fields that are in a task.Config. I would very much like to merge these two things, but expect to do this in a future restructuring as both are used widely and not cordoned off properly (Config has a channel, stdin, stdout, stderr -- and isn't just a 'config', so to speak, as Task is). Since a task.Config is what is used to actually run a container, the result of the aforementioned deficiency was #193 where tasks are improperly configured and ran (namely, memory wrong). async tasks can still not be hot, they will be reverted to default format. would also like to fix this (also part of restructuring). I actually started doing this, hence the changes to those files (the surface area of the change is small and discourages improper future use, so I've left what I've done). this will: closes #193 closes #195 closes #154 removes many unused fields in models.Task, since we have not implemented retries. priority & delay are left, even though they are not used either, the main goal of this is to resolve #193 and both these fields are strongly plumbed into all the mqs, so punting on those two.
80 lines
1.9 KiB
Go
80 lines
1.9 KiB
Go
package protocol
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/fnproject/fn/api/runner/task"
|
|
)
|
|
|
|
var errInvalidProtocol = errors.New("Invalid Protocol")
|
|
|
|
// ContainerIO defines the interface used to talk to a hot function.
|
|
// Internally, a protocol must know when to alternate between stdin and stdout.
|
|
// It returns any protocol error, if present.
|
|
type ContainerIO interface {
|
|
IsStreamable() bool
|
|
|
|
// TODO this should take a drivers.ContainerTask?
|
|
Dispatch(ctx context.Context, t *task.Config) error
|
|
}
|
|
|
|
// Protocol defines all protocols that operates a ContainerIO.
|
|
type Protocol string
|
|
|
|
// hot function protocols
|
|
const (
|
|
Default Protocol = models.FormatDefault
|
|
HTTP Protocol = models.FormatHTTP
|
|
Empty Protocol = ""
|
|
)
|
|
|
|
func (p *Protocol) UnmarshalJSON(b []byte) error {
|
|
switch Protocol(b) {
|
|
case Empty, Default:
|
|
*p = Default
|
|
case HTTP:
|
|
*p = HTTP
|
|
default:
|
|
return errInvalidProtocol
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (p Protocol) MarshalJSON() ([]byte, error) {
|
|
switch p {
|
|
case Empty, Default:
|
|
return []byte(Default), nil
|
|
case HTTP:
|
|
return []byte(HTTP), nil
|
|
}
|
|
return nil, errInvalidProtocol
|
|
}
|
|
|
|
// implements ContainerIO
|
|
type errorProto struct{}
|
|
|
|
func (e *errorProto) IsStreamable() bool { return false }
|
|
func (e *errorProto) Dispatch(ctx context.Context, t *task.Config) error { return errInvalidProtocol }
|
|
|
|
// New creates a valid protocol handler from a I/O pipe representing containers
|
|
// stdin/stdout.
|
|
func New(p Protocol, in io.Writer, out io.Reader) ContainerIO {
|
|
switch p {
|
|
case HTTP:
|
|
return &HTTPProtocol{in, out}
|
|
case Default, Empty:
|
|
return &DefaultProtocol{}
|
|
}
|
|
return &errorProto{} // shouldn't make it past testing...
|
|
}
|
|
|
|
// IsStreamable says whether the given protocol can be used for streaming into
|
|
// hot functions.
|
|
// TODO get rid of ContainerIO and just use Protocol
|
|
func IsStreamable(p Protocol) bool {
|
|
return New(p, nil, nil).IsStreamable()
|
|
}
|