grim/hgkeeper

Replace ioutils as it is deprecated since go 1.17

11 months ago, aklitzing
4ec99415f32b
Parents 9f9a854ed3b3
Children 2d5a3940f721
Replace ioutils as it is deprecated since go 1.17

Reviewed at https://reviews.imfreedom.org/r/2444/
6 files changed, 16 insertions(+), 20 deletions(-)
  • +1 -2
    access/access.go
  • +3 -4
    access/users.go
  • +2 -2
    hg/hgrc.go
  • +2 -3
    hgweb/hgweb.go
  • +4 -5
    setup/command.go
  • +4 -4
    ssh/keys.go
    • --- a/access/access.go Thu Apr 13 00:18:27 2023 -0500
    +++ b/access/access.go Tue May 23 00:31:49 2023 -0500
    @@ -1,7 +1,6 @@
    package access
    import (
    - "io/ioutil"
    "os"
    "path/filepath"
    "strings"
    @@ -32,7 +31,7 @@
    adminRepoName = adminRepo
    adminRepoPath = filepath.Join(reposPath, adminRepo)
    - configPath, err := ioutil.TempFile("", "hgkeeper-hgweb-access-*.config")
    + configPath, err := os.CreateTemp("", "hgkeeper-hgweb-access-*.config")
    if err != nil {
    return err
    }
    --- a/access/users.go Thu Apr 13 00:18:27 2023 -0500
    +++ b/access/users.go Tue May 23 00:31:49 2023 -0500
    @@ -2,7 +2,6 @@
    import (
    "fmt"
    - "io/ioutil"
    "os"
    "path/filepath"
    "strings"
    @@ -38,13 +37,13 @@
    }
    }
    - entries, err := ioutil.ReadDir(keysPath)
    + entries, err := os.ReadDir(keysPath)
    if err != nil {
    return err
    }
    for _, entry := range entries {
    - if entry.Mode().IsRegular() {
    + if entry.Type().IsRegular() {
    filename := filepath.Join(keysPath, entry.Name())
    loadSshKey(filename, entry.Name())
    }
    @@ -54,7 +53,7 @@
    }
    func loadSshKey(filename, username string) {
    - buffer, err := ioutil.ReadFile(filename)
    + buffer, err := os.ReadFile(filename)
    if err != nil {
    zap.S().Warnf("failed to read keyfile for user %s: %v", username, err)
    return
    --- a/hg/hgrc.go Thu Apr 13 00:18:27 2023 -0500
    +++ b/hg/hgrc.go Tue May 23 00:31:49 2023 -0500
    @@ -1,7 +1,7 @@
    package hg
    import (
    - "io/ioutil"
    + "os"
    "path/filepath"
    "gopkg.in/ini.v1"
    @@ -10,7 +10,7 @@
    )
    func createHgrc(writeable bool) (string, error) {
    - tmpfile, err := ioutil.TempFile("", "hgkeeper-*.hgrc")
    + tmpfile, err := os.CreateTemp("", "hgkeeper-*.hgrc")
    if err != nil {
    return "", err
    }
    --- a/hgweb/hgweb.go Thu Apr 13 00:18:27 2023 -0500
    +++ b/hgweb/hgweb.go Tue May 23 00:31:49 2023 -0500
    @@ -2,7 +2,6 @@
    import (
    "embed"
    - "io/ioutil"
    "net/http"
    "net/http/cgi"
    "os"
    @@ -25,7 +24,7 @@
    }
    func (hgw *HGWeb) createConfig() error {
    - configPath, err := ioutil.TempFile("", "hgkeeper-hgweb-*.config")
    + configPath, err := os.CreateTemp("", "hgkeeper-hgweb-*.config")
    if err != nil {
    return err
    }
    @@ -53,7 +52,7 @@
    }
    func (hgw *HGWeb) createCGI() error {
    - cgiPath, err := ioutil.TempFile("", "hgkeeper-hgweb-*.cgi")
    + cgiPath, err := os.CreateTemp("", "hgkeeper-hgweb-*.cgi")
    if err != nil {
    return err
    }
    --- a/setup/command.go Thu Apr 13 00:18:27 2023 -0500
    +++ b/setup/command.go Tue May 23 00:31:49 2023 -0500
    @@ -4,7 +4,6 @@
    "embed"
    "fmt"
    "io/fs"
    - "io/ioutil"
    "os"
    "path/filepath"
    "strings"
    @@ -120,7 +119,7 @@
    return err
    }
    - if err := ioutil.WriteFile(absname, data, 0644); err != nil {
    + if err := os.WriteFile(absname, data, 0644); err != nil {
    return err
    }
    }
    @@ -148,7 +147,7 @@
    }
    // now copy the admin key into the keys directory
    - pubkey, err := ioutil.ReadFile(c.AdminSSHPubkey)
    + pubkey, err := os.ReadFile(c.AdminSSHPubkey)
    if err != nil {
    return err
    }
    @@ -160,7 +159,7 @@
    }
    filenames = append(filenames, relAdminPubkey)
    - if err := ioutil.WriteFile(adminPubkey, pubkey, 0644); err != nil {
    + if err := os.WriteFile(adminPubkey, pubkey, 0644); err != nil {
    return err
    }
    @@ -178,7 +177,7 @@
    }
    func isPubkey(filename string) error {
    - bytes, err := ioutil.ReadFile(filename)
    + bytes, err := os.ReadFile(filename)
    if err != nil {
    return err
    }
    --- a/ssh/keys.go Thu Apr 13 00:18:27 2023 -0500
    +++ b/ssh/keys.go Tue May 23 00:31:49 2023 -0500
    @@ -2,7 +2,7 @@
    import (
    "errors"
    - "io/ioutil"
    + "os"
    "path/filepath"
    "go.uber.org/zap"
    @@ -10,7 +10,7 @@
    )
    func (s *Server) setHostKeysPath(hostKeysPath string) error {
    - files, err := ioutil.ReadDir(hostKeysPath)
    + files, err := os.ReadDir(hostKeysPath)
    if err != nil {
    return err
    }
    @@ -18,10 +18,10 @@
    found := false
    for _, file := range files {
    - if !file.Mode().IsDir() {
    + if !file.IsDir() {
    path := filepath.Join(hostKeysPath, file.Name())
    - data, err := ioutil.ReadFile(path)
    + data, err := os.ReadFile(path)
    if err != nil {
    zap.S().Warnf("failed to read %s", path)
    continue