From caedfea615a94bb369f714ddab4ae0c39441d14d Mon Sep 17 00:00:00 2001 From: Igal Tsoiref Date: Mon, 16 Mar 2026 16:50:51 -0400 Subject: [PATCH] Address PR review nits from pliurh - Check os.OpenFile error in STATUS/GC test - Document that k8sArgs may be nil for STATUS/GC in HandleCNIRequest Made-with: Cursor --- pkg/server/server.go | 5 +++-- pkg/server/thick_cni_test.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/server/server.go b/pkg/server/server.go index 8541532c2..a7d81ebbd 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -84,6 +84,7 @@ func printCmdArgs(args *skel.CmdArgs) string { // HandleCNIRequest is the CNI server handler function; it is invoked whenever // a CNI request is processed. +// Note: k8sArgs may be nil for plugin-level commands (STATUS, GC) that have no pod context. func (s *Server) HandleCNIRequest(cmd string, k8sArgs *types.K8sArgs, cniCmdArgs *skel.CmdArgs) ([]byte, error) { var result []byte var err error @@ -664,12 +665,12 @@ func (s *Server) cmdCheck(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error { return multus.CmdCheck(cmdArgs, s.exec, s.kubeclient) } -func (s *Server) cmdGC(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error { +func (s *Server) cmdGC(cmdArgs *skel.CmdArgs, _ *types.K8sArgs) error { logging.Debugf("CmdGC. CNI conf: %+v", *cmdArgs) return multus.CmdGC(cmdArgs, s.exec, s.kubeclient) } -func (s *Server) cmdStatus(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error { +func (s *Server) cmdStatus(cmdArgs *skel.CmdArgs, _ *types.K8sArgs) error { logging.Debugf("CmdStatus. CNI conf: %+v", *cmdArgs) return multus.CmdStatus(cmdArgs, s.exec, s.kubeclient) } diff --git a/pkg/server/thick_cni_test.go b/pkg/server/thick_cni_test.go index a5a143b6f..4e153e78f 100644 --- a/pkg/server/thick_cni_test.go +++ b/pkg/server/thick_cni_test.go @@ -105,7 +105,8 @@ var _ = Describe(suiteName, func() { var err error K8sClient = fakeK8sClient() // Touch the default network file. - os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755) + _, err = os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755) + Expect(err).NotTo(HaveOccurred()) Expect(FilesystemPreRequirements(thickPluginRunDir)).To(Succeed())