mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
* Don't try to delete an app that wasn't successfully created in the case of failure * Allow datastore implementations to inject additional annotations on objects * Allow for datastores transparently adding annotations on apps, fns and triggers. Change NameIn filter to Name for apps. * Move *List types including JSON annotations for App, Fn and Trigger into models * Change return types for GetApps, GetFns and GetTriggers on datastore to be models.*List and ove cursor generation into datastore * Trigger cursor handling fixed into db layer Also changes the name generation so that it is not in the same order as the id (well is random), this means we are now testing our name ordering. * GetFns now respects cursors * Apps now feeds cursor back * Mock fixes * Fixing up api level cursor decoding * Tidy up treatment of cursors in the db layer * Adding conditions for non nil items lists * fix mock test
204 lines
5.0 KiB
Go
204 lines
5.0 KiB
Go
package models
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
"unicode"
|
|
|
|
"github.com/fnproject/fn/api/common"
|
|
)
|
|
|
|
var (
|
|
ErrAppsMissingID = err{
|
|
code: http.StatusBadRequest,
|
|
error: errors.New("Missing app ID"),
|
|
}
|
|
ErrAppIDProvided = err{
|
|
code: http.StatusBadRequest,
|
|
error: errors.New("App ID cannot be supplied on create"),
|
|
}
|
|
ErrAppsIDMismatch = err{
|
|
code: http.StatusBadRequest,
|
|
error: errors.New("App ID in path does not match ID in body"),
|
|
}
|
|
ErrAppsMissingName = err{
|
|
code: http.StatusBadRequest,
|
|
error: errors.New("Missing app name"),
|
|
}
|
|
ErrAppsTooLongName = err{
|
|
code: http.StatusBadRequest,
|
|
error: fmt.Errorf("App name must be %v characters or less", maxAppName),
|
|
}
|
|
ErrAppsInvalidName = err{
|
|
code: http.StatusBadRequest,
|
|
error: errors.New("Invalid app name"),
|
|
}
|
|
ErrAppsAlreadyExists = err{
|
|
code: http.StatusConflict,
|
|
error: errors.New("App already exists"),
|
|
}
|
|
ErrAppsMissingNew = err{
|
|
code: http.StatusBadRequest,
|
|
error: errors.New("Missing new application"),
|
|
}
|
|
ErrAppsNameImmutable = err{
|
|
code: http.StatusConflict,
|
|
error: errors.New("Could not update - name is immutable"),
|
|
}
|
|
|
|
ErrAppsNotFound = err{
|
|
code: http.StatusNotFound,
|
|
error: errors.New("App not found"),
|
|
}
|
|
)
|
|
|
|
type App struct {
|
|
ID string `json:"id" db:"id"`
|
|
Name string `json:"name" db:"name"`
|
|
Config Config `json:"config,omitempty" db:"config"`
|
|
Annotations Annotations `json:"annotations,omitempty" db:"annotations"`
|
|
SyslogURL *string `json:"syslog_url,omitempty" db:"syslog_url"`
|
|
CreatedAt common.DateTime `json:"created_at,omitempty" db:"created_at"`
|
|
UpdatedAt common.DateTime `json:"updated_at,omitempty" db:"updated_at"`
|
|
}
|
|
|
|
func (a *App) Validate() error {
|
|
|
|
if a.Name == "" {
|
|
return ErrMissingName
|
|
}
|
|
if len(a.Name) > maxAppName {
|
|
return ErrAppsTooLongName
|
|
}
|
|
for _, c := range a.Name {
|
|
if !(unicode.IsLetter(c) || unicode.IsNumber(c) || c == '_' || c == '-') {
|
|
return ErrAppsInvalidName
|
|
}
|
|
}
|
|
err := a.Annotations.Validate()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if a.SyslogURL != nil && *a.SyslogURL != "" {
|
|
sinks := strings.Split(*a.SyslogURL, ",")
|
|
for _, s := range sinks {
|
|
url, err := url.Parse(strings.TrimSpace(s))
|
|
fail := err != nil
|
|
if !fail {
|
|
switch url.Scheme {
|
|
case "udp", "tcp", "tls":
|
|
default:
|
|
fail = true
|
|
}
|
|
}
|
|
if fail {
|
|
return ErrInvalidSyslog(fmt.Sprintf(`invalid syslog url: "%v"`, s))
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (a *App) Clone() *App {
|
|
clone := new(App)
|
|
*clone = *a // shallow copy
|
|
|
|
// now deep copy the map
|
|
if a.Config != nil {
|
|
clone.Config = make(Config, len(a.Config))
|
|
for k, v := range a.Config {
|
|
clone.Config[k] = v
|
|
}
|
|
}
|
|
clone.ID = a.ID
|
|
return clone
|
|
}
|
|
|
|
func (a1 *App) Equals(a2 *App) bool {
|
|
// start off equal, check equivalence of each field.
|
|
// the RHS of && won't eval if eq==false so config checking is lazy
|
|
|
|
eq := true
|
|
eq = eq && a1.ID == a2.ID
|
|
eq = eq && a1.Name == a2.Name
|
|
eq = eq && a1.Config.Equals(a2.Config)
|
|
eq = eq && a1.Annotations.Equals(a2.Annotations)
|
|
// NOTE: datastore tests are not very fun to write with timestamp checks,
|
|
// and these are not values the user may set so we kind of don't care.
|
|
//eq = eq && time.Time(a1.CreatedAt).Equal(time.Time(a2.CreatedAt))
|
|
//eq = eq && time.Time(a1.UpdatedAt).Equal(time.Time(a2.UpdatedAt))
|
|
return eq
|
|
}
|
|
|
|
func (a1 *App) EqualsWithAnnotationSubset(a2 *App) bool {
|
|
// start off equal, check equivalence of each field.
|
|
// the RHS of && won't eval if eq==false so config checking is lazy
|
|
|
|
eq := true
|
|
eq = eq && a1.ID == a2.ID
|
|
eq = eq && a1.Name == a2.Name
|
|
eq = eq && a1.Config.Equals(a2.Config)
|
|
eq = eq && a1.Annotations.Subset(a2.Annotations)
|
|
// NOTE: datastore tests are not very fun to write with timestamp checks,
|
|
// and these are not values the user may set so we kind of don't care.
|
|
//eq = eq && time.Time(a1.CreatedAt).Equal(time.Time(a2.CreatedAt))
|
|
//eq = eq && time.Time(a1.UpdatedAt).Equal(time.Time(a2.UpdatedAt))
|
|
return eq
|
|
}
|
|
|
|
// Update adds entries from patch to a.Config and a.Annotations, and removes entries with empty values.
|
|
func (a *App) Update(patch *App) {
|
|
original := a.Clone()
|
|
|
|
if patch.Config != nil {
|
|
if a.Config == nil {
|
|
a.Config = make(Config)
|
|
}
|
|
for k, v := range patch.Config {
|
|
if v == "" {
|
|
delete(a.Config, k)
|
|
} else {
|
|
a.Config[k] = v
|
|
}
|
|
}
|
|
}
|
|
|
|
if patch.SyslogURL != nil {
|
|
if *patch.SyslogURL == "" {
|
|
a.SyslogURL = nil // hides it from jason
|
|
} else {
|
|
a.SyslogURL = patch.SyslogURL
|
|
}
|
|
}
|
|
|
|
a.Annotations = a.Annotations.MergeChange(patch.Annotations)
|
|
|
|
if !a.Equals(original) {
|
|
a.UpdatedAt = common.DateTime(time.Now())
|
|
}
|
|
}
|
|
|
|
var _ APIError = ErrInvalidSyslog("")
|
|
|
|
type ErrInvalidSyslog string
|
|
|
|
func (e ErrInvalidSyslog) Code() int { return http.StatusBadRequest }
|
|
func (e ErrInvalidSyslog) Error() string { return string(e) }
|
|
|
|
// AppFilter is the filter used for querying apps
|
|
type AppFilter struct {
|
|
Name string
|
|
PerPage int
|
|
Cursor string
|
|
}
|
|
|
|
type AppList struct {
|
|
NextCursor string `json:"next_cursor,omitempty"`
|
|
Items []*App `json:"items"`
|
|
}
|