From b58645a27c6cee96e0bf8c1879cdd56f8e2c4408 Mon Sep 17 00:00:00 2001
From: fsl <1171313930@qq.com>
Date: Thu, 8 Jun 2023 00:20:24 +0800
Subject: [PATCH] fix: remove deprecated ioutil (#528)

Signed-off-by: fengshunli <1171313930@qq.com>
---
 agent/main.go                     |  3 +--
 pkg/diff/diff_test.go             | 10 +++++-----
 pkg/health/health_test.go         |  4 ++--
 pkg/utils/kube/ctl.go             |  4 ++--
 pkg/utils/kube/resource_ops.go    |  4 ++--
 pkg/utils/testing/unstructured.go |  4 ++--
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/agent/main.go b/agent/main.go
index 1e406f489..8d37d2612 100644
--- a/agent/main.go
+++ b/agent/main.go
@@ -6,7 +6,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"github.com/argoproj/gitops-engine/pkg/utils/text"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -78,7 +77,7 @@ func (s *settings) parseManifests() ([]*unstructured.Unstructured, string, error
 			if ext := strings.ToLower(filepath.Ext(info.Name())); ext != ".json" && ext != ".yml" && ext != ".yaml" {
 				return nil
 			}
-			data, err := ioutil.ReadFile(path)
+			data, err := os.ReadFile(path)
 			if err != nil {
 				return err
 			}
diff --git a/pkg/diff/diff_test.go b/pkg/diff/diff_test.go
index 13c304b40..ec8b82038 100644
--- a/pkg/diff/diff_test.go
+++ b/pkg/diff/diff_test.go
@@ -3,7 +3,7 @@ package diff
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -43,7 +43,7 @@ func printDiff(result *DiffResult) (string, error) {
 
 // printDiffInternal prints a diff between two unstructured objects using an external diff utility and returns the output.
 func printDiffInternal(name string, live *unstructured.Unstructured, target *unstructured.Unstructured) ([]byte, error) {
-	tempDir, err := ioutil.TempDir("", "argocd-diff")
+	tempDir, err := os.MkdirTemp("", "argocd-diff")
 	if err != nil {
 		return nil, err
 	}
@@ -55,7 +55,7 @@ func printDiffInternal(name string, live *unstructured.Unstructured, target *uns
 			return nil, err
 		}
 	}
-	err = ioutil.WriteFile(targetFile, targetData, 0644)
+	err = os.WriteFile(targetFile, targetData, 0644)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +67,7 @@ func printDiffInternal(name string, live *unstructured.Unstructured, target *uns
 			return nil, err
 		}
 	}
-	err = ioutil.WriteFile(liveFile, liveData, 0644)
+	err = os.WriteFile(liveFile, liveData, 0644)
 	if err != nil {
 		return nil, err
 	}
@@ -92,7 +92,7 @@ func mustToUnstructured(obj interface{}) *unstructured.Unstructured {
 }
 
 func unmarshalFile(path string) *unstructured.Unstructured {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		panic(err)
 	}
diff --git a/pkg/health/health_test.go b/pkg/health/health_test.go
index 4a35d9148..45ff74941 100644
--- a/pkg/health/health_test.go
+++ b/pkg/health/health_test.go
@@ -5,7 +5,7 @@ Package provides functionality that allows assessing the health state of a Kuber
 package health
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -21,7 +21,7 @@ func assertAppHealth(t *testing.T, yamlPath string, expectedStatus HealthStatusC
 }
 
 func getHealthStatus(yamlPath string, t *testing.T) *HealthStatus {
-	yamlBytes, err := ioutil.ReadFile(yamlPath)
+	yamlBytes, err := os.ReadFile(yamlPath)
 	require.NoError(t, err)
 	var obj unstructured.Unstructured
 	err = yaml.Unmarshal(yamlBytes, &obj)
diff --git a/pkg/utils/kube/ctl.go b/pkg/utils/kube/ctl.go
index cc4c8a80b..4a93ef51a 100644
--- a/pkg/utils/kube/ctl.go
+++ b/pkg/utils/kube/ctl.go
@@ -3,7 +3,7 @@ package kube
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -284,7 +284,7 @@ func (k *KubectlCmd) DeleteResource(ctx context.Context, config *rest.Config, gv
 }
 
 func (k *KubectlCmd) ManageResources(config *rest.Config, openAPISchema openapi.Resources) (ResourceOperations, func(), error) {
-	f, err := ioutil.TempFile(utils.TempDir, "")
+	f, err := os.CreateTemp(utils.TempDir, "")
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to generate temp file for kubeconfig: %v", err)
 	}
diff --git a/pkg/utils/kube/resource_ops.go b/pkg/utils/kube/resource_ops.go
index 72b58fcdb..34ece2cd5 100644
--- a/pkg/utils/kube/resource_ops.go
+++ b/pkg/utils/kube/resource_ops.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -60,7 +60,7 @@ func (k *kubectlResourceOperations) runResourceCommand(ctx context.Context, obj
 	if err != nil {
 		return "", err
 	}
-	manifestFile, err := ioutil.TempFile(io.TempDir, "")
+	manifestFile, err := os.CreateTemp(io.TempDir, "")
 	if err != nil {
 		return "", fmt.Errorf("Failed to generate temp file for manifest: %v", err)
 	}
diff --git a/pkg/utils/testing/unstructured.go b/pkg/utils/testing/unstructured.go
index 2bb875f45..f6c292001 100644
--- a/pkg/utils/testing/unstructured.go
+++ b/pkg/utils/testing/unstructured.go
@@ -2,7 +2,7 @@ package testing
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -10,7 +10,7 @@ import (
 )
 
 func UnstructuredFromFile(path string) *unstructured.Unstructured {
-	file, err := ioutil.ReadFile(path)
+	file, err := os.ReadFile(path)
 	if err != nil {
 		panic(err)
 	}