From 013aa9ec92dd35016855a2c80a00f08ac1b4656b Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:41:08 +0200
Subject: [PATCH] ioutil.ReadFile is deprecated: As of Go 1.16, this function
 simply calls os.ReadFile

---
 collectors/lustreMetric.go   |  2 +-
 pkg/ccTopology/ccTopology.go | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/collectors/lustreMetric.go b/collectors/lustreMetric.go
index bcb9ca6..02ce572 100644
--- a/collectors/lustreMetric.go
+++ b/collectors/lustreMetric.go
@@ -101,7 +101,7 @@ func getMetricData(lines []string, prefix string, offset int) (int64, error) {
 // 	llitedir := filepath.Join(LUSTRE_SYSFS, "llite")
 // 	devdir := filepath.Join(llitedir, device)
 // 	statsfile := filepath.Join(devdir, "stats")
-// 	buffer, err := ioutil.ReadFile(statsfile)
+// 	buffer, err := os.ReadFile(statsfile)
 // 	if err != nil {
 // 		return make([]string, 0)
 // 	}
diff --git a/pkg/ccTopology/ccTopology.go b/pkg/ccTopology/ccTopology.go
index f7d7092..2ea5733 100644
--- a/pkg/ccTopology/ccTopology.go
+++ b/pkg/ccTopology/ccTopology.go
@@ -2,7 +2,6 @@ package ccTopology
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -31,7 +30,7 @@ func intArrayContains(array []int, str int) (int, bool) {
 
 // Used internally for sysfs file reads
 func fileToInt(path string) int {
-	buffer, err := ioutil.ReadFile(path)
+	buffer, err := os.ReadFile(path)
 	if err != nil {
 		log.Print(err)
 		cclogger.ComponentError("ccTopology", "Reading", path, ":", err.Error())
@@ -50,7 +49,7 @@ func fileToInt(path string) int {
 
 // Get list of CPU socket IDs
 func SocketList() []int {
-	buffer, err := ioutil.ReadFile(string(PROCFS_CPUINFO))
+	buffer, err := os.ReadFile(string(PROCFS_CPUINFO))
 	if err != nil {
 		log.Print(err)
 		return nil
@@ -76,7 +75,7 @@ func SocketList() []int {
 
 // Get list of hardware thread IDs in the order of listing in /proc/cpuinfo
 func HwthreadList() []int {
-	buffer, err := ioutil.ReadFile(string(PROCFS_CPUINFO))
+	buffer, err := os.ReadFile(string(PROCFS_CPUINFO))
 	if err != nil {
 		log.Print(err)
 		return nil
@@ -108,7 +107,7 @@ func CpuList() []int {
 
 // Get list of CPU core IDs in the order of listing in /proc/cpuinfo
 func CoreList() []int {
-	buffer, err := ioutil.ReadFile(string(PROCFS_CPUINFO))
+	buffer, err := os.ReadFile(string(PROCFS_CPUINFO))
 	if err != nil {
 		log.Print(err)
 		return nil
@@ -219,7 +218,7 @@ type HwthreadEntry struct {
 func CpuData() []HwthreadEntry {
 
 	// fileToInt := func(path string) int {
-	// 	buffer, err := ioutil.ReadFile(path)
+	// 	buffer, err := os.ReadFile(path)
 	// 	if err != nil {
 	// 		log.Print(err)
 	// 		//cclogger.ComponentError("ccTopology", "Reading", path, ":", err.Error())
@@ -248,7 +247,7 @@ func CpuData() []HwthreadEntry {
 	}
 
 	getSMT := func(cpuid int, basepath string) int {
-		buffer, err := ioutil.ReadFile(fmt.Sprintf("%s/thread_siblings_list", basepath))
+		buffer, err := os.ReadFile(fmt.Sprintf("%s/thread_siblings_list", basepath))
 		if err != nil {
 			cclogger.ComponentError("CCTopology", "CpuData:getSMT", err.Error())
 		}