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

FN_MEMORY, FN_TYPE and precedence for app/route vars

Browse Source
This commit is contained in:
Reed Allman
2017-09-06 02:50:57 -07:00
parent 2341456334
commit c10462cdc5
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/agent/call.go
View File

@@ -65,12 +65,8 @@ func FromRequest(appName, path string, req *http.Request) CallOpt {
// baseVars are the vars on the route & app, not on this specific request [for hot functions]
baseVars := make(map[string]string, len(app.Config)+len(route.Config)+3)
baseVars["FN_FORMAT"] = route.Format
baseVars["FN_APP_NAME"] = appName
baseVars["FN_ROUTE"] = route.Path
baseVars["FN_MEMORY_MB"] = fmt.Sprintf("%d", route.Memory)
// app config
// add app & route config before our standard additions
for k, v := range app.Config {
k = toEnvName("", k)
baseVars[k] = v
@@ -80,6 +76,12 @@ func FromRequest(appName, path string, req *http.Request) CallOpt {
baseVars[k] = v
}
baseVars["FN_FORMAT"] = route.Format
baseVars["FN_APP_NAME"] = appName
baseVars["FN_ROUTE"] = route.Path
baseVars["FN_MEMORY"] = fmt.Sprintf("%d", route.Memory)
baseVars["FN_TYPE"] = route.Type
// envVars contains the full set of env vars, per request + base
envVars := make(map[string]string, len(baseVars)+len(params)+len(req.Header)+3)
@@ -169,6 +171,9 @@ func FromRequest(appName, path string, req *http.Request) CallOpt {
}
}
// TODO this currently relies on FromRequest having happened before to create the model
// here, to be a fully qualified model. We probably should double check but having a way
// to bypass will likely be what's used anyway unless forced.
func FromModel(mCall *models.Call) CallOpt {
return func(a *agent, c *call) error {
c.Call = mCall