Merge pull request #1078 from henry118/multierror

use errors package in golang v20 to join multiple errors
containernetworking · Mar 27, 2024 · 83287db · 83287db
2 parents 951d8d0 + a67dabb
commit 83287db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 59 deletions.
diff --git a/libcni/api.go b/libcni/api.go
@@ -23,6 +23,7 @@ package libcni
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -815,7 +816,7 @@ func (c *CNIConfig) GCNetworkList(ctx context.Context, list *NetworkConfigList,
 		}
 	}
 
-	return joinErrors(errs...)
+	return errors.Join(errs...)
 }
 
 func (c *CNIConfig) gcNetwork(ctx context.Context, net *NetworkConfig) error {

diff --git a/libcni/multierror.go b/libcni/multierror.go