Remove os methods wrappers

Author: tataruty

tests/framework/results.go

@@ -15,7 +15,7 @@ import (
 
 // CreateResultsDir creates and returns the name of the results directory for a test.
 func CreateResultsDir(testName, version string) (string, error) {
-	pwd, err := GetWorkingDir()
+	pwd, err := os.Getwd()
 	if err != nil {
 		return "", err
 	}
@@ -31,13 +31,12 @@ func CreateResultsDir(testName, version string) (string, error) {
 		}
 	}
 
-	return dirName, MkdirAll(dirName, 0o777)
+	return dirName, os.MkdirAll(dirName, 0o777)
 }
 
 // CreateResultsFile creates and returns the results file for a test.
 func CreateResultsFile(filename string) (*os.File, error) {
-	GinkgoWriter.Printf("Creating results file %q\n", filename)
-	outFile, err := OpenFile(filename, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0o644)
+	outFile, err := os.OpenFile(filename, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0o644)
 	if err != nil {
 		GinkgoWriter.Printf("ERROR occurred during creating results file %q, error: %s\n", filename, err)
 
@@ -89,7 +88,7 @@ func WriteSystemInfoToFile(file *os.File, ci ClusterInfo, plus bool) error {
 }
 
 func generatePNG(resultsDir, inputFilename, outputFilename, configFilename string) error {
-	pwd, err := GetWorkingDir()
+	pwd, err := os.Getwd()
 	if err != nil {
 		return err
 	}
@@ -158,115 +157,25 @@ func WriteContent(resultsFile *os.File, content string) error {
 	return nil
 }
 
-// GetWorkingDir returns the current working directory.
-func GetWorkingDir() (string, error) {
-	pwd, err := os.Getwd()
-	if err != nil {
-		GinkgoWriter.Printf("ERROR occurred during getting current working directory %q, error: %s\n", pwd, err)
-	}
-
-	return pwd, err
-}
-
-// CreateFile creates a new file with the given name.
-func CreateFile(fileName string) (*os.File, error) {
-	file, err := os.Create(fileName)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR occurred during creating file %q, error: %s\n", fileName, err)
-	}
-
-	return file, err
-}
-
-// OpenFile opens an existing file with the given name.
-func OpenFile(name string, flag int, perm os.FileMode) (*os.File, error) {
-	file, err := os.OpenFile(name, flag, perm)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR occurred during openning results file %q, error: %s\n", name, err)
-	}
-
-	return file, err
-}
-
-// MkdirAll creates a directory with the specified permissions.
-func MkdirAll(path string, perm os.FileMode) error {
-	err := os.MkdirAll(path, perm)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR occurred during creating directory %q, error: %s\n", path, err)
-	}
-
-	return err
-}
-
-// ReadFile reads the contents of a file.
-func ReadFile(file string) ([]byte, error) {
-	result, err := os.ReadFile(file)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR occurred during reading file %q, error: %s\n", file, err)
-	}
-
-	return result, err
-}
-
-// WriteString writes a string to the given file.
-func WriteString(file *os.File, content string) (int, error) {
-	result, err := io.WriteString(file, content)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR writing error log file: %v\n", err)
-	}
-	return result, err
-}
-
-// WriteCSVRecord writes a CSV record using the given writer.
-func WriteCSVRecord(writer *csv.Writer, record []string) error {
-	err := writer.Write(record)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR writing CSV record: %v\n", err)
-	}
-
-	return err
-}
-
-// UserHomeDir returns the user's home directory.
-func UserHomeDir() (string, error) {
-	dir, err := os.UserHomeDir()
-	if err != nil {
-		GinkgoWriter.Printf("ERROR getting user home directory, error: %s\n", err)
-	}
-	GinkgoWriter.Printf("User home directory is %q\n", dir)
-
-	return dir, err
-}
-
-// Remove removes the specified file or empty directory.
-func Remove(name string) error {
-	err := os.Remove(name)
-	if err != nil {
-		GinkgoWriter.Printf("ERROR occurred during removing %q, error: %s\n", name, err)
-	}
-
-	return err
-}
-
 // NewVegetaCSVEncoder returns a vegeta CSV encoder.
 func NewVegetaCSVEncoder(w io.Writer) vegeta.Encoder {
 	return vegeta.NewCSVEncoder(w)
 }
 
 // NewCSVResultsWriter creates and returns a CSV results file and writer.
 func NewCSVResultsWriter(resultsDir, fileName string, resultHeaders ...string) (*os.File, *csv.Writer, error) {
-	if err := MkdirAll(resultsDir, 0o750); err != nil {
+	if err := os.MkdirAll(resultsDir, 0o750); err != nil {
 		return nil, nil, err
 	}
 
-	file, err := OpenFile(filepath.Join(resultsDir, fileName), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o644)
+	file, err := os.OpenFile(filepath.Join(resultsDir, fileName), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o644)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	writer := csv.NewWriter(file)
 
-	if err = WriteCSVRecord(writer, resultHeaders); err != nil {
+	if err = writer.Write(resultHeaders); err != nil {
 		return nil, nil, err
 	}
 

tests/suite/longevity_test.go

@@ -75,7 +75,7 @@ var _ = Describe("Longevity", Label("longevity-setup", "longevity-teardown"), fu
 		Expect(framework.WriteSystemInfoToFile(resultsFile, clusterInfo, *plusEnabled)).To(Succeed())
 
 		// gather wrk output
-		homeDir, err := framework.UserHomeDir()
+		homeDir, err := os.UserHomeDir()
 		Expect(err).ToNot(HaveOccurred())
 
 		Expect(framework.WriteContent(resultsFile, "\n## Traffic\n")).To(Succeed())
@@ -90,7 +90,7 @@ var _ = Describe("Longevity", Label("longevity-setup", "longevity-teardown"), fu
 
 func writeTrafficResults(resultsFile *os.File, homeDir, filename, testname string) error {
 	file := fmt.Sprintf("%s/%s", homeDir, filename)
-	content, err := framework.ReadFile(file)
+	content, err := os.ReadFile(file)
 	if err != nil {
 		return err
 	}

tests/suite/scale_test.go

@@ -205,12 +205,12 @@ The logs are attached only if there are errors.
 
 		// attach error logs
 		if len(errors) > 0 {
-			f, err := framework.CreateFile(fileName)
+			f, err := os.Create(fileName)
 			Expect(err).ToNot(HaveOccurred())
 			defer f.Close()
 
 			for _, e := range errors {
-				_, err = framework.WriteString(f, fmt.Sprintf("%s\n", e))
+				_, err = io.WriteString(f, fmt.Sprintf("%s\n", e))
 				Expect(err).ToNot(HaveOccurred())
 			}
 		}
@@ -320,7 +320,7 @@ The logs are attached only if there are errors.
 			framework.GenerateMemoryPNG(testResultsDir, memCSV, memPNG),
 		).To(Succeed())
 
-		Expect(framework.Remove(memCSV)).To(Succeed())
+		Expect(os.Remove(memCSV)).To(Succeed())
 
 		result, err = promInstance.QueryRange(
 			fmt.Sprintf(`rate(container_cpu_usage_seconds_total{pod="%s",container="nginx-gateway"}[2m])`, ngfPodName),
@@ -340,7 +340,7 @@ The logs are attached only if there are errors.
 			framework.GenerateCPUPNG(testResultsDir, cpuCSV, cpuPNG),
 		).To(Succeed())
 
-		Expect(framework.Remove(cpuCSV)).To(Succeed())
+		Expect(os.Remove(cpuCSV)).To(Succeed())
 
 		eventsCount, err := framework.GetEventsCountWithStartTime(promInstance, ngfPodName, startTime)
 		Expect(err).ToNot(HaveOccurred())
@@ -491,7 +491,7 @@ The logs are attached only if there are errors.
 			seconds := ttr.Seconds()
 			record := []string{strconv.Itoa(i + 1), strconv.FormatFloat(seconds, 'f', -1, 64)}
 
-			Expect(framework.WriteCSVRecord(writer, record)).To(Succeed())
+			Expect(writer.Write(record)).To(Succeed())
 		}
 
 		writer.Flush()
@@ -502,7 +502,7 @@ The logs are attached only if there are errors.
 			framework.GenerateTTRPNG(testResultsDir, ttrCsvFile.Name(), ttrPNG),
 		).To(Succeed())
 
-		Expect(framework.Remove(ttrCsvFile.Name())).To(Succeed())
+		Expect(os.Remove(ttrCsvFile.Name())).To(Succeed())
 	}
 
 	runScaleUpstreams := func() {
@@ -585,7 +585,7 @@ The logs are attached only if there are errors.
 		const testName = "TestScale_Listeners"
 
 		testResultsDir := filepath.Join(resultsDir, testName)
-		Expect(framework.MkdirAll(testResultsDir, 0o755)).To(Succeed())
+		Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
 
 		objects, err := framework.GenerateScaleListenerObjects(httpListenerCount, false /*non-tls*/)
 		Expect(err).ToNot(HaveOccurred())
@@ -609,7 +609,7 @@ The logs are attached only if there are errors.
 		const testName = "TestScale_HTTPSListeners"
 
 		testResultsDir := filepath.Join(resultsDir, testName)
-		Expect(framework.MkdirAll(testResultsDir, 0o755)).To(Succeed())
+		Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
 
 		objects, err := framework.GenerateScaleListenerObjects(httpsListenerCount, true /*tls*/)
 		Expect(err).ToNot(HaveOccurred())
@@ -633,7 +633,7 @@ The logs are attached only if there are errors.
 		const testName = "TestScale_HTTPRoutes"
 
 		testResultsDir := filepath.Join(resultsDir, testName)
-		Expect(framework.MkdirAll(testResultsDir, 0o755)).To(Succeed())
+		Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
 
 		objects, err := framework.GenerateScaleHTTPRouteObjects(httpRouteCount)
 		Expect(err).ToNot(HaveOccurred())
@@ -660,7 +660,7 @@ The logs are attached only if there are errors.
 		const testName = "TestScale_UpstreamServers"
 
 		testResultsDir := filepath.Join(resultsDir, testName)
-		Expect(framework.MkdirAll(testResultsDir, 0o755)).To(Succeed())
+		Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
 
 		runTestWithMetricsAndLogs(
 			testName,