faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-10 00:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add null-checking for labels

Browse Source 
Fixes an issue introduced in #45 which was undetected. When
users do not pass in "labels" to the deployment - or a valid
empty object, then a nil dereference causes a panic.

Fixes: #101

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd) 2020-09-11 12:02:02 +01:00 committed by Alex Ellis
parent 6752a61a95
commit 93825e8354
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/provider/handlers/deploy.go
View File

@ -69,6 +69,7 @@ func deploy(ctx context.Context, req types.FunctionDeployment, client *container
if err != nil { if err != nil {
return err return err
} }
imgRef := reference.TagNameOnly(r).String() imgRef := reference.TagNameOnly(r).String()
snapshotter := "" snapshotter := ""
@ -98,6 +99,11 @@ func deploy(ctx context.Context, req types.FunctionDeployment, client *container
name := req.Service name := req.Service
labels := map[string]string{}
if req.Labels != nil {
labels = *req.Labels
}
container, err := client.NewContainer( container, err := client.NewContainer(
ctx, ctx,
name, name,
@ -108,7 +114,7 @@ func deploy(ctx context.Context, req types.FunctionDeployment, client *container
oci.WithCapabilities([]string{"CAP_NET_RAW"}), oci.WithCapabilities([]string{"CAP_NET_RAW"}),
oci.WithMounts(mounts), oci.WithMounts(mounts),
oci.WithEnv(envs)), oci.WithEnv(envs)),
containerd.WithContainerLabels(*req.Labels), containerd.WithContainerLabels(labels),
) )
if err != nil { if err != nil {