From 8cae8191a07e1e3940dfca12acf1893e099885c0 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 15 Nov 2024 10:54:49 +0100
Subject: [PATCH] Drop use of deprecated io/ioutil package

The io/ioutil package was deprecated in Go 1.16[^1], which is the minimum
required version per go.mod. Replace the uses of the package with the
respective replacement functions.

[^1]: https://go.dev/doc/go1.16#ioutil
---
 hack/verify-boilerplate.go            | 3 +--
 validators/cgroup_validator_linux.go  | 3 +--
 validators/kernel_validator.go        | 3 +--
 validators/package_validator_linux.go | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/hack/verify-boilerplate.go b/hack/verify-boilerplate.go
index afea08f..e80283f 100644
--- a/hack/verify-boilerplate.go
+++ b/hack/verify-boilerplate.go
@@ -19,7 +19,6 @@ package main
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -146,7 +145,7 @@ func verifyFile(filePath string) error {
 	}
 
 	// read the file
-	b, err := ioutil.ReadFile(filePath)
+	b, err := os.ReadFile(filePath)
 	if err != nil {
 		return err
 	}
diff --git a/validators/cgroup_validator_linux.go b/validators/cgroup_validator_linux.go
index 3945b39..ce93e7b 100644
--- a/validators/cgroup_validator_linux.go
+++ b/validators/cgroup_validator_linux.go
@@ -23,7 +23,6 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -196,7 +195,7 @@ func (c *CgroupsValidator) getCgroupV2Subsystems(unifiedMountpoint string) ([]st
 	if freezeSupported {
 		subsystems = append(subsystems, "freezer")
 	}
-	data, err := ioutil.ReadFile(filepath.Join(unifiedMountpoint, "cgroup.controllers"))
+	data, err := os.ReadFile(filepath.Join(unifiedMountpoint, "cgroup.controllers"))
 	if err != nil {
 		return nil, err, warn
 	}
diff --git a/validators/kernel_validator.go b/validators/kernel_validator.go
index 42af3be..b4d88a1 100644
--- a/validators/kernel_validator.go
+++ b/validators/kernel_validator.go
@@ -22,7 +22,6 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -198,7 +197,7 @@ func (k *KernelValidator) getKernelConfigReader() (io.Reader, error) {
 			}
 			// Buffer the whole file, so that we can close the file and unload
 			// kernel config module in this function.
-			b, err := ioutil.ReadFile(path)
+			b, err := os.ReadFile(path)
 			if err != nil {
 				return nil, err
 			}
diff --git a/validators/package_validator_linux.go b/validators/package_validator_linux.go
index 01ddab9..9af1b34 100644
--- a/validators/package_validator_linux.go
+++ b/validators/package_validator_linux.go
@@ -22,7 +22,7 @@ package system
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"os/exec"
 	"strings"
 
@@ -171,7 +171,7 @@ func getKernelRelease() (string, error) {
 // getOSDistro returns the OS distro of the local machine.
 func getOSDistro() (string, error) {
 	f := "/etc/lsb-release"
-	b, err := ioutil.ReadFile(f)
+	b, err := os.ReadFile(f)
 	if err != nil {
 		return "", fmt.Errorf("failed to read %q: %w", f, err)
 	}