[ASCII-2357]: Do not use %w when the error is nil (#30092)

DataDog · Oct 24, 2024 · a5b503f · a5b503f
1 parent 3845925
commit a5b503f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/cmd/security-agent/subcommands/runtime/command.go b/cmd/security-agent/subcommands/runtime/command.go
@@ -352,7 +352,7 @@ func dumpNetworkNamespace(_ log.Component, _ config.Component, _ secrets.Compone
 	}
 
 	if len(resp.GetError()) > 0 {
-		return fmt.Errorf("couldn't dump network namespaces: %w", err)
+		return fmt.Errorf("couldn't dump network namespaces: %s", resp.GetError())
 	}
 
 	fmt.Printf("Network namespace dump: %s\n", resp.GetDumpFilename())

diff --git a/cmd/system-probe/subcommands/runtime/command.go b/cmd/system-probe/subcommands/runtime/command.go
@@ -346,7 +346,7 @@ func dumpNetworkNamespace(_ log.Component, _ config.Component, _ secrets.Compone
 	}
 
 	if len(resp.GetError()) > 0 {
-		return fmt.Errorf("couldn't dump network namespaces: %w", err)
+		return fmt.Errorf("couldn't dump network namespaces: %s", resp.GetError())
 	}
 
 	fmt.Printf("Network namespace dump: %s\n", resp.GetDumpFilename())

diff --git a/pkg/ebpf/bytecode/permissions.go b/pkg/ebpf/bytecode/permissions.go
@@ -24,7 +24,7 @@ func VerifyAssetPermissions(assetPath string) error {
 	}
 	stat, ok := info.Sys().(*syscall.Stat_t)
 	if !ok {
-		return fmt.Errorf("error getting permissions for output file %s: %w", assetPath, err)
+		return fmt.Errorf("error getting permissions for output file %s", assetPath)
 	}
 	if stat.Uid != 0 || stat.Gid != 0 || info.Mode().Perm()&os.FileMode(0022) != 0 {
 		return fmt.Errorf("%s has incorrect permissions: user=%v, group=%v, permissions=%v", assetPath, stat.Uid, stat.Gid, info.Mode().Perm())

diff --git a/pkg/fleet/installer/service/datadog_installer.go b/pkg/fleet/installer/service/datadog_installer.go
@@ -52,7 +52,7 @@ func SetupInstaller(ctx context.Context) (err error) {
 	if err = addDDAgentGroup(ctx); err != nil {
 		return fmt.Errorf("error creating dd-agent group: %w", err)
 	}
-	if addDDAgentUser(ctx) != nil {
+	if err = addDDAgentUser(ctx); err != nil {
 		return fmt.Errorf("error creating dd-agent user: %w", err)
 	}
 	err = exec.CommandContext(ctx, "usermod", "-g", "dd-agent", "dd-agent").Run()

diff --git a/pkg/security/probe/monitors/runtime/runtime_monitor.go b/pkg/security/probe/monitors/runtime/runtime_monitor.go
@@ -58,7 +58,7 @@ func (m *Monitor) sendCgroupMetrics() error {
 		}
 	}
 	if len(memoryCgroup.Path) == 0 {
-		return fmt.Errorf("couldn't find memory controller in: %v: %w", cgroups, err)
+		return fmt.Errorf("couldn't find memory controller in: %v", cgroups)
 	}
 
 	usageInBytes, err := utils.ParseCgroupFileValue("memory", memoryCgroup.Path, "memory.usage_in_bytes")

diff --git a/pkg/util/containers/metrics/system/collector_linux.go b/pkg/util/containers/metrics/system/collector_linux.go
@@ -240,7 +240,7 @@ func (c *systemCollector) GetContainerIDForInode(inode uint64, cacheValidity tim
 
 		cg = c.reader.GetCgroupByInode(inode)
 		if cg == nil {
-			return "", fmt.Errorf("containerID not found from inode %d, err: %w", inode, err)
+			return "", fmt.Errorf("containerID not found from inode %d", inode)
 		}
 	}