From 82f7cbcc929280531cf10b86c57f3da7689027c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= Date: Sun, 26 Jan 2025 11:31:04 +0100 Subject: [PATCH] resolve ioutil deprecations --- cmd/dkl-dir2config/search-list.go | 3 +-- cmd/dkl-local-server/boot-img.go | 5 ++--- cmd/dkl-local-server/boot-iso.go | 9 ++++----- cmd/dkl-local-server/boot-tar.go | 5 ++--- cmd/dkl-local-server/secrets.go | 3 +-- cmd/dkl-local-server/ssh-secrets.go | 7 +++---- cmd/dkl-local-server/ws-configs.go | 3 +-- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/cmd/dkl-dir2config/search-list.go b/cmd/dkl-dir2config/search-list.go index ccae582..8a85b5e 100644 --- a/cmd/dkl-dir2config/search-list.go +++ b/cmd/dkl-dir2config/search-list.go @@ -3,7 +3,6 @@ package main import ( "fmt" "io" - "io/ioutil" "os" "sort" ) @@ -23,7 +22,7 @@ func read(path string) (ba []byte, err error) { } defer r.Close() - return ioutil.ReadAll(r) + return io.ReadAll(r) } err = fmt.Errorf("%s: %w", path, os.ErrNotExist) diff --git a/cmd/dkl-local-server/boot-img.go b/cmd/dkl-local-server/boot-img.go index ea0ad47..c0889c1 100644 --- a/cmd/dkl-local-server/boot-img.go +++ b/cmd/dkl-local-server/boot-img.go @@ -6,7 +6,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -18,7 +17,7 @@ import ( ) func buildBootImg(out io.Writer, ctx *renderContext) (err error) { - bootImg, err := ioutil.TempFile(os.TempDir(), "boot.img-") + bootImg, err := os.CreateTemp(os.TempDir(), "boot.img-") if err != nil { return } @@ -30,7 +29,7 @@ func buildBootImg(out io.Writer, ctx *renderContext) (err error) { } // send the result - bootImg.Seek(0, os.SEEK_SET) + bootImg.Seek(0, io.SeekStart) io.Copy(out, bootImg) return } diff --git a/cmd/dkl-local-server/boot-iso.go b/cmd/dkl-local-server/boot-iso.go index 10e53dc..f773b74 100644 --- a/cmd/dkl-local-server/boot-iso.go +++ b/cmd/dkl-local-server/boot-iso.go @@ -3,7 +3,6 @@ package main import ( "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -14,7 +13,7 @@ import ( ) func buildBootISO(out io.Writer, ctx *renderContext) (err error) { - tempDir, err := ioutil.TempDir("/tmp", "iso-v2-") + tempDir, err := os.MkdirTemp("/tmp", "iso-v2-") if err != nil { return } @@ -70,7 +69,7 @@ func buildBootISO(out io.Writer, ctx *renderContext) (err error) { f.Write([]byte("direktil marker file\n")) f.Close() - err = ioutil.WriteFile(filepath.Join(tempDir, "grub", "grub.cfg"), []byte(` + err = os.WriteFile(filepath.Join(tempDir, "grub", "grub.cfg"), []byte(` search --set=root --file /`+tag+` insmod all_video @@ -113,7 +112,7 @@ menuentry "Direktil" { defer out.Close() - b, err := ioutil.ReadFile("/usr/lib/grub/i386-pc/cdboot.img") + b, err := os.ReadFile("/usr/lib/grub/i386-pc/cdboot.img") if err != nil { return err } @@ -122,7 +121,7 @@ menuentry "Direktil" { return err } - b, err = ioutil.ReadFile(coreImgPath) + b, err = os.ReadFile(coreImgPath) if err != nil { return err } diff --git a/cmd/dkl-local-server/boot-tar.go b/cmd/dkl-local-server/boot-tar.go index c10e88e..3a8640c 100644 --- a/cmd/dkl-local-server/boot-tar.go +++ b/cmd/dkl-local-server/boot-tar.go @@ -4,7 +4,6 @@ import ( "archive/tar" "bytes" "io" - "io/ioutil" "log" "os" @@ -37,7 +36,7 @@ func buildBootTar(out io.Writer, ctx *renderContext) (err error) { return } - kernelBytes, err := ioutil.ReadFile(kernelPath) + kernelBytes, err := os.ReadFile(kernelPath) if err != nil { return } @@ -98,7 +97,7 @@ func buildBootEFITar(out io.Writer, ctx *renderContext) (err error) { return } - kernelBytes, err := ioutil.ReadFile(kernelPath) + kernelBytes, err := os.ReadFile(kernelPath) if err != nil { return } diff --git a/cmd/dkl-local-server/secrets.go b/cmd/dkl-local-server/secrets.go index bcc750e..cff4af3 100644 --- a/cmd/dkl-local-server/secrets.go +++ b/cmd/dkl-local-server/secrets.go @@ -3,7 +3,6 @@ package main import ( "encoding/json" "errors" - "io/ioutil" "os" "path/filepath" "time" @@ -43,7 +42,7 @@ func loadSecretData(config *config.Config) (sd *SecretData, err error) { config: config, } - ba, err := ioutil.ReadFile(secretDataPath()) + ba, err := os.ReadFile(secretDataPath()) if err != nil { if os.IsNotExist(err) { err = nil diff --git a/cmd/dkl-local-server/ssh-secrets.go b/cmd/dkl-local-server/ssh-secrets.go index 5ddec0b..4353754 100644 --- a/cmd/dkl-local-server/ssh-secrets.go +++ b/cmd/dkl-local-server/ssh-secrets.go @@ -10,7 +10,6 @@ import ( "crypto/x509" "encoding/asn1" "fmt" - "io/ioutil" "os" "os/exec" ) @@ -42,7 +41,7 @@ genLoop: } err = func() (err error) { - outFile, err := ioutil.TempFile("/tmp", "dls-key.") + outFile, err := os.CreateTemp("/tmp", "dls-key.") if err != nil { return } @@ -70,12 +69,12 @@ genLoop: return } - privKey, err = ioutil.ReadFile(outPath) + privKey, err = os.ReadFile(outPath) if err != nil { return } - pubKey, err = ioutil.ReadFile(outPath + ".pub") + pubKey, err = os.ReadFile(outPath + ".pub") if err != nil { return } diff --git a/cmd/dkl-local-server/ws-configs.go b/cmd/dkl-local-server/ws-configs.go index 1b75d86..ff978c3 100644 --- a/cmd/dkl-local-server/ws-configs.go +++ b/cmd/dkl-local-server/ws-configs.go @@ -3,7 +3,6 @@ package main import ( "compress/gzip" "io" - "io/ioutil" "os" "path/filepath" @@ -25,7 +24,7 @@ func wsUploadConfig(req *restful.Request, resp *restful.Response) { } func writeNewConfig(reader io.Reader) (err error) { - out, err := ioutil.TempFile(*dataDir, ".config-upload") + out, err := os.CreateTemp(*dataDir, ".config-upload") if err != nil { return }