From f4364185253eaa18125611ee987435286bb3cfdf Mon Sep 17 00:00:00 2001 From: Gabe Rosenhouse Date: Wed, 13 Jul 2016 22:54:22 -0400 Subject: [PATCH] pkg/skel: improve error message for missing CNI_COMMAND env var This makes the error message for missing CNI_COMMAND consistent with that of other required environment variables. --- pkg/skel/skel.go | 8 +++++--- pkg/skel/skel_test.go | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/skel/skel.go b/pkg/skel/skel.go index bed405c3..4325ec69 100644 --- a/pkg/skel/skel.go +++ b/pkg/skel/skel.go @@ -106,9 +106,11 @@ func (t *dispatcher) getCmdArgsFromEnv() (string, *CmdArgs, error) { argsMissing := false for _, v := range vars { *v.val = t.Getenv(v.name) - if v.reqForCmd[cmd] && *v.val == "" { - fmt.Fprintf(t.Stderr, "%v env variable missing\n", v.name) - argsMissing = true + if *v.val == "" { + if v.reqForCmd[cmd] || v.name == "CNI_COMMAND" { + fmt.Fprintf(t.Stderr, "%v env variable missing\n", v.name) + argsMissing = true + } } } diff --git a/pkg/skel/skel_test.go b/pkg/skel/skel_test.go index 9974c9a5..39df2716 100644 --- a/pkg/skel/skel_test.go +++ b/pkg/skel/skel_test.go @@ -115,7 +115,7 @@ var _ = Describe("dispatching to the correct callback", func() { }) DescribeTable("required / optional env vars", envVarChecker, - // TODO: Entry("command", "CNI_COMMAND", true), + Entry("command", "CNI_COMMAND", true), Entry("container id", "CNI_CONTAINER_ID", false), Entry("net ns", "CNI_NETNS", true), Entry("if name", "CNI_IFNAME", true), @@ -162,7 +162,7 @@ var _ = Describe("dispatching to the correct callback", func() { }) DescribeTable("required / optional env vars", envVarChecker, - // TODO: Entry("command", "CNI_COMMAND", true), + Entry("command", "CNI_COMMAND", true), Entry("container id", "CNI_CONTAINER_ID", false), Entry("net ns", "CNI_NETNS", false), Entry("if name", "CNI_IFNAME", true),