Skip to content

Commit 57b7a3c

Browse files
marquizmarquiz
committed
Wrap nested errors
1 parent 42b1251 commit 57b7a3c

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎pkg/nfd-master/nfd-master.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func (m *nfdMaster) Run() error {
251251
if !m.config.NoPublish {
252252
err := m.updateMasterNode()
253253
if err != nil {
254-
return fmt.Errorf("failed to update master node: %v", err)
254+
return fmt.Errorf("failed to update master node: %w", err)
255255
}
256256
}
257257

@@ -368,7 +368,7 @@ func (m *nfdMaster) runGrpcServer(errChan chan<- error) {
368368
// Create server listening for TCP connections
369369
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", m.args.Port))
370370
if err != nil {
371-
errChan <- fmt.Errorf("failed to listen: %v", err)
371+
errChan <- fmt.Errorf("failed to listen: %w", err)
372372
return
373373
}
374374

@@ -414,7 +414,7 @@ func (m *nfdMaster) runGrpcServer(errChan chan<- error) {
414414

415415
case err := <-grpcErr:
416416
if err != nil {
417-
errChan <- fmt.Errorf("gRPC server exited with an error: %v", err)
417+
errChan <- fmt.Errorf("gRPC server exited with an error: %w", err)
418418
}
419419
klog.InfoS("gRPC server stopped")
420420
}
@@ -552,7 +552,7 @@ func (m *nfdMaster) updateMasterNode() error {
552552
"/metadata/annotations")
553553
err = m.apihelper.PatchNode(cli, node.Name, p)
554554
if err != nil {
555-
return fmt.Errorf("failed to patch node annotations: %v", err)
555+
return fmt.Errorf("failed to patch node annotations: %w", err)
556556
}
557557

558558
return nil
@@ -951,7 +951,7 @@ func (m *nfdMaster) setTaints(cli *kubernetes.Clientset, taints []corev1.Taint,
951951
if len(patches) > 0 {
952952
err = m.apihelper.PatchNode(cli, node.Name, patches)
953953
if err != nil {
954-
return fmt.Errorf("error while patching node object: %v", err)
954+
return fmt.Errorf("error while patching node object: %w", err)
955955
}
956956
klog.V(1).InfoS("patched node annotations for taints", "nodeName", nodeName)
957957
}
@@ -1112,13 +1112,13 @@ func (m *nfdMaster) updateNodeObject(cli *kubernetes.Clientset, nodeName string,
11121112
statusPatches := m.createExtendedResourcePatches(node, extendedResources)
11131113
err = m.apihelper.PatchNodeStatus(cli, node.Name, statusPatches)
11141114
if err != nil {
1115-
return fmt.Errorf("error while patching extended resources: %v", err)
1115+
return fmt.Errorf("error while patching extended resources: %w", err)
11161116
}
11171117

11181118
// Patch the node object in the apiserver
11191119
err = m.apihelper.PatchNode(cli, node.Name, patches)
11201120
if err != nil {
1121-
return fmt.Errorf("error while patching node object: %v", err)
1121+
return fmt.Errorf("error while patching node object: %w", err)
11221122
}
11231123

11241124
if len(patches) > 0 || len(statusPatches) > 0 {
@@ -1235,7 +1235,7 @@ func (m *nfdMaster) configure(filepath string, overrides string) error {
12351235

12361236
// Parse config overrides
12371237
if err := yaml.Unmarshal([]byte(overrides), c); err != nil {
1238-
return fmt.Errorf("failed to parse -options: %s", err)
1238+
return fmt.Errorf("failed to parse -options: %w", err)
12391239
}
12401240
if m.args.Overrides.NoPublish != nil {
12411241
c.NoPublish = *m.args.Overrides.NoPublish

‎pkg/resourcemonitor/podresourcesscanner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func (resMon *PodResourcesScanner) Scan() (ScanResponse, error) {
153153
hasDevice := hasDevice(podResource)
154154
isWatchable, isIntegralGuaranteed, err := resMon.isWatchable(podResource.GetNamespace(), podResource.GetName(), hasDevice)
155155
if err != nil {
156-
return ScanResponse{}, fmt.Errorf("checking if pod in a namespace is watchable, namespace:%v, pod name %v: %v", podResource.GetNamespace(), podResource.GetName(), err)
156+
return ScanResponse{}, fmt.Errorf("checking if pod in a namespace is watchable, namespace:%v, pod name %v: %w", podResource.GetNamespace(), podResource.GetName(), err)
157157
}
158158
if !isWatchable {
159159
continue

‎pkg/utils/fswatcher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ func (w *FsWatcher) reset(names ...string) error {
6767
func (w *FsWatcher) initWatcher() error {
6868
if w.Watcher != nil {
6969
if err := w.Watcher.Close(); err != nil {
70-
return fmt.Errorf("failed to close fsnotify watcher: %v", err)
70+
return fmt.Errorf("failed to close fsnotify watcher: %w", err)
7171
}
7272
}
7373
w.paths = make(map[string]struct{})
7474

7575
watcher, err := fsnotify.NewWatcher()
7676
if err != nil {
7777
w.Watcher = nil
78-
return fmt.Errorf("failed to create fsnotify watcher: %v", err)
78+
return fmt.Errorf("failed to create fsnotify watcher: %w", err)
7979
}
8080
w.Watcher = watcher
8181

‎pkg/utils/klog/klog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func MergeKlogConfiguration(klogArgs map[string]*utils.KlogFlagVal, klogConfig K
5252
v = a.DefValue()
5353
}
5454
if err := a.SetFromConfig(v); err != nil {
55-
return fmt.Errorf("failed to set logger option klog.%s = %v: %v", k, v, err)
55+
return fmt.Errorf("failed to set logger option klog.%s = %v: %w", k, v, err)
5656
}
5757
}
5858
}

‎pkg/utils/tls.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ func (c *TlsConfig) UpdateConfig(certFile, keyFile, caFile string) error {
4747
// Load cert for authenticating this server
4848
cert, err := tls.LoadX509KeyPair(certFile, keyFile)
4949
if err != nil {
50-
return fmt.Errorf("failed to load server certificate: %v", err)
50+
return fmt.Errorf("failed to load server certificate: %w", err)
5151
}
5252
// Load CA cert for client cert verification
5353
caCert, err := os.ReadFile(caFile)
5454
if err != nil {
55-
return fmt.Errorf("failed to read root certificate file: %v", err)
55+
return fmt.Errorf("failed to read root certificate file: %w", err)
5656
}
5757
caPool := x509.NewCertPool()
5858
if ok := caPool.AppendCertsFromPEM(caCert); !ok {

‎source/cpu/power_amd64.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func discoverSSTBF() (bool, error) {
6969

7070
effectiveBaseFreq, err := strconv.Atoi(strings.TrimSpace(string(data)))
7171
if err != nil {
72-
return false, fmt.Errorf("non-integer value of %q: %v", filePath, err)
72+
return false, fmt.Errorf("non-integer value of %q: %w", filePath, err)
7373
}
7474

7575
// Sanity check: Return an error (we don't have enough information to

‎source/local/local.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func getFeaturesFromHooks() (map[string]string, map[string]string, error) {
291291
klog.InfoS("hook directory does not exist", "path", hookDir)
292292
return features, labels, nil
293293
}
294-
return features, labels, fmt.Errorf("unable to access %v: %v", hookDir, err)
294+
return features, labels, fmt.Errorf("unable to access %v: %w", hookDir, err)
295295
}
296296
if len(files) > 0 {
297297
klog.InfoS("hooks are DEPRECATED since v0.12.0 and support will be removed in a future release; use feature files instead")
@@ -382,7 +382,7 @@ func getFeaturesFromFiles() (map[string]string, map[string]string, error) {
382382
klog.InfoS("features directory does not exist", "path", featureFilesDir)
383383
return features, labels, nil
384384
}
385-
return features, labels, fmt.Errorf("unable to access %v: %v", featureFilesDir, err)
385+
return features, labels, fmt.Errorf("unable to access %v: %w", featureFilesDir, err)
386386
}
387387

388388
for _, file := range files {

‎source/pci/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var optionalDevAttrs = []string{"sriov_totalvfs", "iommu_group/type", "iommu/int
3636
func readSinglePciAttribute(devPath string, attrName string) (string, error) {
3737
data, err := os.ReadFile(filepath.Join(devPath, attrName))
3838
if err != nil {
39-
return "", fmt.Errorf("failed to read device attribute %s: %v", attrName, err)
39+
return "", fmt.Errorf("failed to read device attribute %s: %w", attrName, err)
4040
}
4141
// Strip whitespace and '0x' prefix
4242
attrVal := strings.TrimSpace(strings.TrimPrefix(string(data), "0x"))
@@ -55,7 +55,7 @@ func readPciDevInfo(devPath string) (*nfdv1alpha1.InstanceFeature, error) {
5555
for _, attr := range mandatoryDevAttrs {
5656
attrVal, err := readSinglePciAttribute(devPath, attr)
5757
if err != nil {
58-
return nil, fmt.Errorf("failed to read device %s: %s", attr, err)
58+
return nil, fmt.Errorf("failed to read device %s: %w", attr, err)
5959
}
6060
attrs[attr] = attrVal
6161
}

‎source/usb/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var devAttrFileMap = map[string]string{
4343
func readSingleUsbSysfsAttribute(path string) (string, error) {
4444
data, err := os.ReadFile(path)
4545
if err != nil {
46-
return "", fmt.Errorf("failed to read device attribute %s: %v", filepath.Base(path), err)
46+
return "", fmt.Errorf("failed to read device attribute %s: %w", filepath.Base(path), err)
4747
}
4848

4949
attrVal := strings.TrimSpace(string(data))

0 commit comments

Comments
 (0)