From 24df4a21d6f358d4bc37bf2229bc744eec22ccdf Mon Sep 17 00:00:00 2001
From: Andrei Pohilko <andrei.pokhilko@gmail.com>
Date: Fri, 2 Jun 2023 13:06:10 +0100
Subject: [PATCH] Fix linter errors after go 1.20

---
 pkg/dashboard/api_test.go           |  3 +--
 pkg/dashboard/objects/releases.go   | 12 ++++++------
 pkg/dashboard/objects/repos_test.go | 11 +++++------
 pkg/dashboard/utils/utils.go        |  5 ++---
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkg/dashboard/api_test.go b/pkg/dashboard/api_test.go
index 86b3586..e97e4ca 100644
--- a/pkg/dashboard/api_test.go
+++ b/pkg/dashboard/api_test.go
@@ -1,7 +1,6 @@
 package dashboard
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -34,7 +33,7 @@ func TestMain(m *testing.M) { // fixture to set logging level via env variable
 	}
 
 	inMemStorage = storage.Init(driver.NewMemory())
-	d, err := ioutil.TempDir("", "helm")
+	d, err := os.MkdirTemp("", "helm")
 	if err != nil {
 		panic(err)
 	}
diff --git a/pkg/dashboard/objects/releases.go b/pkg/dashboard/objects/releases.go
index 0c732ce..b25a903 100644
--- a/pkg/dashboard/objects/releases.go
+++ b/pkg/dashboard/objects/releases.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
+	"io"
 	"os"
 	"path"
 	"sync"
@@ -140,7 +140,7 @@ func locateChart(pathOpts action.ChartPathOptions, chart string, settings *cli.E
 			err = errorx.Decorate(err, "An error occurred while checking for chart dependencies. You may need to run `helm dependency build` to fetch missing dependencies")
 			if true { // client.DependencyUpdate
 				man := &downloader.Manager{
-					Out:              ioutil.Discard,
+					Out:              io.Discard,
 					ChartPath:        cp,
 					Keyring:          pathOpts.Keyring,
 					SkipUpdate:       false,
@@ -347,7 +347,7 @@ func (r *Release) restoreChart() (string, error) {
 	// we're unlikely to have the original chart, let's try the cheesy thing...
 
 	log.Infof("Attempting to restore the chart for %s", r.Orig.Name)
-	dir, err := ioutil.TempDir("", "khd-*")
+	dir, err := os.MkdirTemp("", "khd-*")
 	if err != nil {
 		return "", errorx.Decorate(err, "failed to get temporary directory")
 	}
@@ -357,7 +357,7 @@ func (r *Release) restoreChart() (string, error) {
 	if err != nil {
 		return "", errorx.Decorate(err, "failed to restore Chart.yaml")
 	}
-	err = ioutil.WriteFile(path.Join(dir, "Chart.yaml"), cdata, 0644)
+	err = os.WriteFile(path.Join(dir, "Chart.yaml"), cdata, 0644)
 	if err != nil {
 		return "", errorx.Decorate(err, "failed to write file Chart.yaml")
 	}
@@ -367,7 +367,7 @@ func (r *Release) restoreChart() (string, error) {
 	if err != nil {
 		return "", errorx.Decorate(err, "failed to restore values.yaml")
 	}
-	err = ioutil.WriteFile(path.Join(dir, "values.yaml"), vdata, 0644)
+	err = os.WriteFile(path.Join(dir, "values.yaml"), vdata, 0644)
 	if err != nil {
 		return "", errorx.Decorate(err, "failed to write file values.yaml")
 	}
@@ -381,7 +381,7 @@ func (r *Release) restoreChart() (string, error) {
 			return "", errorx.Decorate(err, "failed to create directory for file: %s", fname)
 		}
 
-		err = ioutil.WriteFile(fname, f.Data, 0644)
+		err = os.WriteFile(fname, f.Data, 0644)
 		if err != nil {
 			return "", errorx.Decorate(err, "failed to write file to restore chart: %s", fname)
 		}
diff --git a/pkg/dashboard/objects/repos_test.go b/pkg/dashboard/objects/repos_test.go
index cb6fd76..209fd46 100644
--- a/pkg/dashboard/objects/repos_test.go
+++ b/pkg/dashboard/objects/repos_test.go
@@ -1,7 +1,6 @@
 package objects
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -22,23 +21,23 @@ func initRepository(t *testing.T, filePath string, devel bool) *Repositories {
 
 	settings := cli.New()
 
-	fname, err := ioutil.TempFile("", "repo-*.yaml")
+	fname, err := os.MkdirTemp("", "repo-*.yaml")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	input, err := ioutil.ReadFile(filePath)
+	input, err := os.ReadFile(filePath)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = ioutil.WriteFile(fname.Name(), input, 0644)
+	err = os.WriteFile(fname, input, 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	t.Cleanup(func() {
-		err := os.Remove(fname.Name())
+		err := os.Remove(fname)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -50,7 +49,7 @@ func initRepository(t *testing.T, filePath string, devel bool) *Repositories {
 	}
 
 	// Sets the repository file path
-	settings.RepositoryConfig = fname.Name()
+	settings.RepositoryConfig = fname
 	settings.RepositoryCache = path.Dir(filePath)
 
 	testRepository := &Repositories{
diff --git a/pkg/dashboard/utils/utils.go b/pkg/dashboard/utils/utils.go
index a0e9d2c..687659a 100644
--- a/pkg/dashboard/utils/utils.go
+++ b/pkg/dashboard/utils/utils.go
@@ -3,7 +3,6 @@ package utils
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"regexp"
@@ -34,12 +33,12 @@ func ChartAndVersion(x string) (string, string, error) {
 }
 
 func TempFile(txt string) (string, func(), error) {
-	file, err := ioutil.TempFile("", "helm_dahsboard_*.yaml")
+	file, err := os.CreateTemp("", "helm_dahsboard_*.yaml")
 	if err != nil {
 		return "", nil, err
 	}
 
-	err = ioutil.WriteFile(file.Name(), []byte(txt), 0600)
+	err = os.WriteFile(file.Name(), []byte(txt), 0600)
 	if err != nil {
 		return "", nil, err
 	}