From d21f24c7827c6ea6e843153f9e8710d917a9732d Mon Sep 17 00:00:00 2001 From: Soo Oh Date: Thu, 22 Aug 2024 16:38:12 -0700 Subject: [PATCH] Add nil checks and debug logs for CNI client --- ecs-agent/netlib/model/ecscni/client.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ecs-agent/netlib/model/ecscni/client.go b/ecs-agent/netlib/model/ecscni/client.go index 6097ba0827b..8e6a7c7307e 100644 --- a/ecs-agent/netlib/model/ecscni/client.go +++ b/ecs-agent/netlib/model/ecscni/client.go @@ -24,6 +24,8 @@ import ( "github.com/containernetworking/cni/pkg/invoke" "github.com/containernetworking/cni/pkg/types" "github.com/pkg/errors" + + "github.com/aws/amazon-ecs-agent/ecs-agent/logger" ) const ( @@ -51,6 +53,15 @@ func (c *cniClient) Add(ctx context.Context, config PluginConfig) (types.Result, if err != nil { return nil, err } + if net == nil { + err = errors.New("Failed to build network config, net is nil.") + return nil, err + } + if net.Network == nil { + err = errors.New("Failed to build network config, net.Network is nil.") + return nil, err + } + logger.Debug("Built network config.", logger.Fields{"Type": net.Network.Type}) return c.cni.AddNetwork(ctx, net, rt) }