mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
App ID (#641)
* App ID * Clean-up * Use ID or name to reference apps * Can use app by name or ID * Get rid of AppName for routes API and model routes API is completely backwards-compatible routes API accepts both app ID and name * Get rid of AppName from calls API and model * Fixing tests * Get rid of AppName from logs API and model * Restrict API to work with app names only * Addressing review comments * Fix for hybrid mode * Fix rebase problems * Addressing review comments * Addressing review comments pt.2 * Fixing test issue * Addressing review comments pt.3 * Updated docstring * Adjust UpdateApp SQL implementation to work with app IDs instead of names * Fixing tests * fmt after rebase * Make tests green again! * Use GetAppByID wherever it is necessary - adding new v2 endpoints to keep hybrid api/runner mode working - extract CallBase from Call object to expose that to a user (it doesn't include any app reference, as we do for all other API objects) * Get rid of GetAppByName * Adjusting server router setup * Make hybrid work again * Fix datastore tests * Fixing tests * Do not ignore app_id * Resolve issues after rebase * Updating test to make it work as it was * Tabula rasa for migrations * Adding calls API test - we need to ensure we give "App not found" for the missing app and missing call in first place - making previous test work (request missing call for the existing app) * Make datastore tests work fine with correctly applied migrations * Make CallFunction middleware work again had to adjust its implementation to set app ID before proceeding * The biggest rebase ever made * Fix 8's migration * Fix tests * Fix hybrid client * Fix tests problem * Increment app ID migration version * Fixing TestAppUpdate * Fix rebase issues * Addressing review comments * Renew vendor * Updated swagger doc per recommendations
This commit is contained in:
committed by
Reed Allman
parent
4e90844a67
commit
3c15ca6ea6
@@ -4,10 +4,12 @@ import (
|
||||
"time"
|
||||
"unicode"
|
||||
|
||||
"github.com/fnproject/fn/api/id"
|
||||
"github.com/go-openapi/strfmt"
|
||||
)
|
||||
|
||||
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"`
|
||||
@@ -26,6 +28,9 @@ func (a *App) SetDefaults() {
|
||||
// keeps the json from being nil
|
||||
a.Config = map[string]string{}
|
||||
}
|
||||
if a.ID == "" {
|
||||
a.ID = id.New().String()
|
||||
}
|
||||
}
|
||||
|
||||
func (a *App) Validate() error {
|
||||
@@ -58,7 +63,7 @@ func (a *App) Clone() *App {
|
||||
clone.Config[k] = v
|
||||
}
|
||||
}
|
||||
|
||||
clone.ID = a.ID
|
||||
return clone
|
||||
}
|
||||
|
||||
@@ -67,6 +72,7 @@ func (a1 *App) Equals(a2 *App) bool {
|
||||
// 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)
|
||||
|
||||
Reference in New Issue
Block a user