faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-29 18:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: variable names, adding tests and http constants

Browse Source 
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis
2017-12-01 18:19:54 +00:00
parent 2452fdea0b
commit 23a7187435
19 changed files with 166 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gateway/handlers/reader.go
View File

@ -42,16 +42,11 @@ func MakeFunctionReader(metricsOptions metrics.MetricOptions, c client.ServiceAP
for _, service := range services {
if len(service.Spec.TaskTemplate.ContainerSpec.Labels["function"]) > 0 {
var envProcess string
for _, env := range service.Spec.TaskTemplate.ContainerSpec.Env {
if strings.Contains(env, "fprocess=") {
envProcess = env[len("fprocess="):]
}
}
envProcess := getEnvProcess(service.Spec.TaskTemplate.ContainerSpec.Env)
// Required (copy by value)
labels := service.Spec.Annotations.Labels
f := requests.Function{
Name: service.Spec.Name,
Image: service.Spec.TaskTemplate.ContainerSpec.Image,
@ -67,7 +62,19 @@ func MakeFunctionReader(metricsOptions metrics.MetricOptions, c client.ServiceAP
functionBytes, _ := json.Marshal(functions)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(200)
w.WriteHeader(http.StatusOK)
w.Write(functionBytes)
}
}
func getEnvProcess(envVars []string) string {
var value string
for _, env := range envVars {
if strings.Contains(env, "fprocess=") {
value = env[len("fprocess="):]
}
}
return value
}