chore: Replace deprecated io/ioutil functions with recommended alternatives (#9542)

# Which Problems Are Solved

- The `io/ioutil` package was deprecated in Go 1.16.  
  - Reference: https://go.dev/doc/go1.16#ioutil  

# How the Problems Are Solved

- Replaced deprecated functions with their recommended alternatives:  
  - `ioutil.ReadFile` → `os.ReadFile`  
  - `ioutil.ReadAll` → `io.ReadAll`  
  - `ioutil.NopCloser` → `io.NopCloser`
This commit is contained in:
Kenta Yamaguchi 2025-03-17 22:17:14 +09:00 committed by GitHub
parent 19f022e1cf
commit d57fa819cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 16 additions and 15 deletions

View File

@ -4,7 +4,8 @@ import (
"context" "context"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"io/ioutil" "io"
"os"
"strconv" "strconv"
"time" "time"
@ -214,7 +215,7 @@ func (s *Server) transportDataFromFile(ctx context.Context, v1Transformation boo
data = s3Data data = s3Data
} }
if localInput != nil { if localInput != nil {
localData, err := ioutil.ReadFile(localInput.Path) localData, err := os.ReadFile(localInput.Path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -274,7 +275,7 @@ func getFileFromS3(ctx context.Context, input *admin_pb.ImportDataRequest_S3Inpu
} }
defer object.Close() defer object.Close()
return ioutil.ReadAll(object) return io.ReadAll(object)
} }
func getFileFromGCS(ctx context.Context, input *admin_pb.ImportDataRequest_GCSInput) (_ []byte, err error) { func getFileFromGCS(ctx context.Context, input *admin_pb.ImportDataRequest_GCSInput) (_ []byte, err error) {
@ -297,7 +298,7 @@ func getFileFromGCS(ctx context.Context, input *admin_pb.ImportDataRequest_GCSIn
return nil, err return nil, err
} }
defer reader.Close() defer reader.Close()
return ioutil.ReadAll(reader) return io.ReadAll(reader)
} }
func importOrg1(ctx context.Context, s *Server, errors *[]*admin_pb.ImportDataError, ctxData authz.CtxData, org *admin_pb.DataOrg, success *admin_pb.ImportDataSuccess, count *counts, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator, passwordlessInitCode crypto.Generator) (err error) { func importOrg1(ctx context.Context, s *Server, errors *[]*admin_pb.ImportDataError, ctxData authz.CtxData, org *admin_pb.DataOrg, success *admin_pb.ImportDataSuccess, count *counts, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator, passwordlessInitCode crypto.Generator) (err error) {

View File

@ -3,7 +3,7 @@ package command
import ( import (
"bytes" "bytes"
"context" "context"
"io/ioutil" "io"
"net/http" "net/http"
"testing" "testing"
@ -882,7 +882,7 @@ func newTestClient(httpStatus int, metadata []byte) *http.Client {
fn := roundTripperFunc(func(req *http.Request) *http.Response { fn := roundTripperFunc(func(req *http.Request) *http.Response {
return &http.Response{ return &http.Response{
StatusCode: httpStatus, StatusCode: httpStatus,
Body: ioutil.NopCloser(bytes.NewBuffer(metadata)), Body: io.NopCloser(bytes.NewBuffer(metadata)),
Header: make(http.Header), //must be non-nil value Header: make(http.Header), //must be non-nil value
} }
}) })

View File

@ -5,7 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"hash/fnv" "hash/fnv"
"io/ioutil" "io"
"net" "net"
"net/http" "net/http"
"os" "os"
@ -200,7 +200,7 @@ func metadataWebhookID() (uint16, error) {
if resp.StatusCode >= 400 && resp.StatusCode < 600 { if resp.StatusCode >= 400 && resp.StatusCode < 600 {
return 0, fmt.Errorf("metadata endpoint returned an unsuccessful status code %d", resp.StatusCode) return 0, fmt.Errorf("metadata endpoint returned an unsuccessful status code %d", resp.StatusCode)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@ -3,7 +3,7 @@ package templates
import ( import (
"bytes" "bytes"
"html/template" "html/template"
"io/ioutil" "io"
"net/http" "net/http"
) )
@ -51,7 +51,7 @@ func readFile(dir http.FileSystem, fileName string) (*template.Template, error)
return nil, err return nil, err
} }
defer f.Close() defer f.Close()
content, err := ioutil.ReadAll(f) content, err := io.ReadAll(f)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -68,7 +68,7 @@ func readFileFromDatabase(dir http.FileSystem, fileName string) (*template.Templ
return nil, err return nil, err
} }
defer f.Close() defer f.Close()
content, err := ioutil.ReadAll(f) content, err := io.ReadAll(f)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -6,7 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"os" "os"
"time" "time"
@ -320,7 +320,7 @@ func (q *Queries) readTranslationFile(namespace i18n.Namespace, filename string)
if err != nil { if err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-93njw", "Errors.TranslationFile.ReadError") return nil, zerrors.ThrowInternal(err, "QUERY-93njw", "Errors.TranslationFile.ReadError")
} }
contents, err := ioutil.ReadAll(r) contents, err := io.ReadAll(r)
if err != nil { if err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-l0fse", "Errors.TranslationFile.ReadError") return nil, zerrors.ThrowInternal(err, "QUERY-l0fse", "Errors.TranslationFile.ReadError")
} }

View File

@ -3,7 +3,7 @@ package renderer
import ( import (
"context" "context"
"html/template" "html/template"
"io/ioutil" "io"
"net/http" "net/http"
"os" "os"
@ -107,7 +107,7 @@ func (r *Renderer) addFileToTemplate(dir http.FileSystem, tmpl *template.Templat
return err return err
} }
defer f.Close() defer f.Close()
content, err := ioutil.ReadAll(f) content, err := io.ReadAll(f)
if err != nil { if err != nil {
return err return err
} }