MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-28 21:04:01 +01:00
Code Issues Releases Wiki Activity

refactor: move from io/ioutil to io and os package (#17109)

Browse source 
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
Eng Zer Jun 2021-09-22 13:38:34 +08:00 committed by GitHub
parent aa631d8cd1
commit f2e7d5477f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
103 changed files with 261 additions and 314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/generate-bindata.go
View file

@ -11,7 +11,6 @@ import (
"bytes"
"crypto/sha1"
"fmt"
"io/ioutil"
"log"
"net/http"
"os"
@ -28,7 +27,7 @@ func needsUpdate(dir string, filename string) (bool, []byte) {
needRegen = true
}
oldHash, err := ioutil.ReadFile(filename + ".hash")
oldHash, err := os.ReadFile(filename + ".hash")
if err != nil {
oldHash = []byte{}
}
@ -83,5 +82,5 @@ func main() {
if err != nil {
log.Fatalf("%v\n", err)
}
_ = ioutil.WriteFile(filename+".hash", newHash, 0666)
_ = os.WriteFile(filename+".hash", newHash, 0666)
}

9
build/generate-emoji.go
View file

@ -12,9 +12,10 @@ import (
"flag"
"fmt"
"go/format"
"io/ioutil"
"io"
"log"
"net/http"
"os"
"regexp"
"sort"
"strconv"
@ -67,7 +68,7 @@ func main() {
}
// write
err = ioutil.WriteFile(*flagOut, buf, 0644)
err = os.WriteFile(*flagOut, buf, 0644)
if err != nil {
log.Fatal(err)
}
@ -96,7 +97,7 @@ func generate() ([]byte, error) {
defer res.Body.Close()
// read all
body, err := ioutil.ReadAll(res.Body)
body, err := io.ReadAll(res.Body)
if err != nil {
return nil, err
}
@ -157,7 +158,7 @@ func generate() ([]byte, error) {
// write a JSON file to use with tribute (write before adding skin tones since we can't support them there yet)
file, _ := json.Marshal(data)
_ = ioutil.WriteFile("assets/emoji.json", file, 0644)
_ = os.WriteFile("assets/emoji.json", file, 0644)
// Add skin tones to emoji that support it
var (

7
build/generate-gitignores.go
View file

@ -9,7 +9,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"os"
@ -34,7 +33,7 @@ func main() {
flag.StringVar(&githubApiToken, "token", "", "github api token")
flag.Parse()
file, err := ioutil.TempFile(os.TempDir(), prefix)
file, err := os.CreateTemp(os.TempDir(), prefix)
if err != nil {
log.Fatalf("Failed to create temp file. %s", err)
@ -114,13 +113,13 @@ func main() {
for dst, src := range filesToCopy {
// Read all content of src to data
src = path.Join(destination, src)
data, err := ioutil.ReadFile(src)
data, err := os.ReadFile(src)
if err != nil {
log.Fatalf("Failed to read src file. %s", err)
}
// Write data to dst
dst = path.Join(destination, dst)
err = ioutil.WriteFile(dst, data, 0644)
err = os.WriteFile(dst, data, 0644)
if err != nil {
log.Fatalf("Failed to write new file. %s", err)
}

3
build/generate-licenses.go
View file

@ -9,7 +9,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"os"
@ -34,7 +33,7 @@ func main() {
flag.StringVar(&githubApiToken, "token", "", "github api token")
flag.Parse()
file, err := ioutil.TempFile(os.TempDir(), prefix)
file, err := os.CreateTemp(os.TempDir(), prefix)
if err != nil {
log.Fatalf("Failed to create temp file. %s", err)

3
cmd/dump.go
View file

@ -7,7 +7,6 @@ package cmd
import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
@ -247,7 +246,7 @@ func runDump(ctx *cli.Context) error {
fatal("Path does not exist: %s", tmpDir)
}
dbDump, err := ioutil.TempFile(tmpDir, "gitea-db.sql")
dbDump, err := os.CreateTemp(tmpDir, "gitea-db.sql")
if err != nil {
fatal("Failed to create tmp file: %v", err)
}

3
contrib/fixtures/fixture_generation.go
View file

@ -6,7 +6,6 @@ package main
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -65,7 +64,7 @@ func generate(name string) error {
return err
}
path := filepath.Join(fixturesDir, name+".yml")
if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil {
if err := os.WriteFile(path, []byte(data), 0644); err != nil {
return fmt.Errorf("%s: %+v", path, err)
}
fmt.Printf("%s created.\n", path)

9
contrib/pr/checkout.go
View file

@ -12,7 +12,6 @@ import (
"context"
"flag"
"fmt"
"io/ioutil"
"log"
"net/http"
"net/url"
@ -52,11 +51,11 @@ func runPR() {
setting.SetCustomPathAndConf("", "", "")
setting.NewContext()
setting.RepoRootPath, err = ioutil.TempDir(os.TempDir(), "repos")
setting.RepoRootPath, err = os.MkdirTemp(os.TempDir(), "repos")
if err != nil {
log.Fatalf("TempDir: %v\n", err)
}
setting.AppDataPath, err = ioutil.TempDir(os.TempDir(), "appdata")
setting.AppDataPath, err = os.MkdirTemp(os.TempDir(), "appdata")
if err != nil {
log.Fatalf("TempDir: %v\n", err)
}
@ -181,7 +180,7 @@ func main() {
codeFilePath = filepath.FromSlash(codeFilePath) //Convert to running OS
//Copy this file if it will not exist in the PR branch
dat, err := ioutil.ReadFile(codeFilePath)
dat, err := os.ReadFile(codeFilePath)
if err != nil {
log.Fatalf("Failed to cache this code file : %v", err)
}
@ -245,7 +244,7 @@ func main() {
if err != nil {
log.Fatalf("Failed to duplicate this code file in PR : %v", err)
}
err = ioutil.WriteFile(codeFilePath, dat, 0644)
err = os.WriteFile(codeFilePath, dat, 0644)
if err != nil {
log.Fatalf("Failed to duplicate this code file in PR : %v", err)
}

6
integrations/api_helper_for_declarative_test.go
View file

@ -7,9 +7,9 @@ package integrations
import (
"context"
"fmt"
"io/ioutil"
"net/http"
"net/url"
"os"
"testing"
"time"
@ -163,7 +163,7 @@ func doAPICreateUserKey(ctx APITestContext, keyname, keyFile string, callback ..
return func(t *testing.T) {
urlStr := fmt.Sprintf("/api/v1/user/keys?token=%s", ctx.Token)
dataPubKey, err := ioutil.ReadFile(keyFile + ".pub")
dataPubKey, err := os.ReadFile(keyFile + ".pub")
assert.NoError(t, err)
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateKeyOption{
Title: keyname,
@ -199,7 +199,7 @@ func doAPICreateDeployKey(ctx APITestContext, keyname, keyFile string, readOnly
return func(t *testing.T) {
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", ctx.Username, ctx.Reponame, ctx.Token)
dataPubKey, err := ioutil.ReadFile(keyFile + ".pub")
dataPubKey, err := os.ReadFile(keyFile + ".pub")
assert.NoError(t, err)
req := NewRequestWithJSON(t, "POST", urlStr, api.CreateKeyOption{
Title: keyname,

6
integrations/api_repo_test.go
View file

@ -6,9 +6,9 @@ package integrations
import (
"fmt"
"io/ioutil"
"net/http"
"net/url"
"os"
"testing"
"code.gitea.io/gitea/models"
@ -356,7 +356,7 @@ func testAPIRepoMigrateConflict(t *testing.T, u *url.URL) {
httpContext := baseAPITestContext
httpContext.Reponame = "repo-tmp-17"
dstPath, err := ioutil.TempDir("", httpContext.Reponame)
dstPath, err := os.MkdirTemp("", httpContext.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
t.Run("CreateRepo", doAPICreateRepository(httpContext, false))
@ -419,7 +419,7 @@ func testAPIRepoCreateConflict(t *testing.T, u *url.URL) {
httpContext := baseAPITestContext
httpContext.Reponame = "repo-tmp-17"
dstPath, err := ioutil.TempDir("", httpContext.Reponame)
dstPath, err := os.MkdirTemp("", httpContext.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
t.Run("CreateRepo", doAPICreateRepository(httpContext, false))

3
integrations/create_no_session_test.go
View file

@ -5,7 +5,6 @@
package integrations
import (
"io/ioutil"
"net/http"
"net/http/httptest"
"os"
@ -69,7 +68,7 @@ func TestSessionFileCreation(t *testing.T) {
config.Provider = "file"
// Now create a temporaryDirectory
tmpDir, err := ioutil.TempDir("", "sessions")
tmpDir, err := os.MkdirTemp("", "sessions")
assert.NoError(t, err)
defer func() {
if _, err := os.Stat(tmpDir); !os.IsNotExist(err) {

6
integrations/git_clone_wiki_test.go
View file

@ -7,8 +7,8 @@ package integrations
import (
"context"
"fmt"
"io/ioutil"
"net/url"
"os"
"path/filepath"
"testing"
@ -24,7 +24,7 @@ func assertFileExist(t *testing.T, p string) {
}
func assertFileEqual(t *testing.T, p string, content []byte) {
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
assert.NoError(t, err)
assert.EqualValues(t, content, bs)
}
@ -33,7 +33,7 @@ func TestRepoCloneWiki(t *testing.T) {
onGiteaRun(t, func(t *testing.T, u *url.URL) {
defer prepareTestEnv(t)()
dstPath, err := ioutil.TempDir("", "clone_wiki")
dstPath, err := os.MkdirTemp("", "clone_wiki")
assert.NoError(t, err)
r := fmt.Sprintf("%suser2/repo1.wiki.git", u.String())

9
integrations/git_helper_for_declarative_test.go
View file

@ -7,7 +7,6 @@ package integrations
import (
"context"
"fmt"
"io/ioutil"
"net"
"net/http"
"net/url"
@ -28,7 +27,7 @@ import (
func withKeyFile(t *testing.T, keyname string, callback func(string)) {
tmpDir, err := ioutil.TempDir("", "key-file")
tmpDir, err := os.MkdirTemp("", "key-file")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
@ -39,7 +38,7 @@ func withKeyFile(t *testing.T, keyname string, callback func(string)) {
err = ssh.GenKeyPair(keyFile)
assert.NoError(t, err)
err = ioutil.WriteFile(path.Join(tmpDir, "ssh"), []byte("#!/bin/bash\n"+
err = os.WriteFile(path.Join(tmpDir, "ssh"), []byte("#!/bin/bash\n"+
"ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0700)
assert.NoError(t, err)
@ -125,7 +124,7 @@ func doGitClone(dstLocalPath string, u *url.URL) func(*testing.T) {
func doGitCloneFail(u *url.URL) func(*testing.T) {
return func(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "doGitCloneFail")
tmpDir, err := os.MkdirTemp("", "doGitCloneFail")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
assert.Error(t, git.Clone(u.String(), tmpDir, git.CloneRepoOptions{}))
@ -139,7 +138,7 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
return func(t *testing.T) {
// Init repository in dstPath
assert.NoError(t, git.InitRepository(dstPath, false))
assert.NoError(t, ioutil.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0644))
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0644))
assert.NoError(t, git.AddChanges(dstPath, true))
signature := git.Signature{
Email: "test@example.com",

4
integrations/git_smart_http_test.go
View file

@ -5,7 +5,7 @@
package integrations
import (
"io/ioutil"
"io"
"net/http"
"net/url"
"testing"
@ -62,7 +62,7 @@ func testGitSmartHTTP(t *testing.T, u *url.URL) {
assert.NoError(t, err)
defer resp.Body.Close()
assert.EqualValues(t, kase.code, resp.StatusCode)
_, err = ioutil.ReadAll(resp.Body)
_, err = io.ReadAll(resp.Body)
assert.NoError(t, err)
})
}

16
integrations/git_test.go
View file

@ -7,10 +7,10 @@ package integrations
import (
"encoding/hex"
"fmt"
"io/ioutil"
"math/rand"
"net/http"
"net/url"
"os"
"path"
"path/filepath"
"strconv"
@ -52,7 +52,7 @@ func testGit(t *testing.T, u *url.URL) {
httpContext.Reponame = "repo-tmp-17"
forkedUserCtx.Reponame = httpContext.Reponame
dstPath, err := ioutil.TempDir("", httpContext.Reponame)
dstPath, err := os.MkdirTemp("", httpContext.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
@ -102,7 +102,7 @@ func testGit(t *testing.T, u *url.URL) {
sshURL := createSSHUrl(sshContext.GitPath(), u)
//Setup clone folder
dstPath, err := ioutil.TempDir("", sshContext.Reponame)
dstPath, err := os.MkdirTemp("", sshContext.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
@ -128,7 +128,7 @@ func testGit(t *testing.T, u *url.URL) {
}
func ensureAnonymousClone(t *testing.T, u *url.URL) {
dstLocalPath, err := ioutil.TempDir("", "repo1")
dstLocalPath, err := os.MkdirTemp("", "repo1")
assert.NoError(t, err)
defer util.RemoveAll(dstLocalPath)
t.Run("CloneAnonymous", doGitClone(dstLocalPath, u))
@ -311,7 +311,7 @@ func generateCommitWithNewData(size int, repoPath, email, fullName, prefix strin
buffer := make([]byte, bufSize)
tmpFile, err := ioutil.TempFile(repoPath, prefix)
tmpFile, err := os.CreateTemp(repoPath, prefix)
if err != nil {
return "", err
}
@ -558,7 +558,7 @@ func doPushCreate(ctx APITestContext, u *url.URL) func(t *testing.T) {
u.Path = ctx.GitPath()
// Create a temporary directory
tmpDir, err := ioutil.TempDir("", ctx.Reponame)
tmpDir, err := os.MkdirTemp("", ctx.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
@ -636,7 +636,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
t.Run("CreateHeadBranch", doGitCreateBranch(dstPath, headBranch))
t.Run("AddCommit", func(t *testing.T) {
err := ioutil.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content"), 0666)
err := os.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content"), 0666)
if !assert.NoError(t, err) {
return
}
@ -710,7 +710,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
}
t.Run("AddCommit2", func(t *testing.T) {
err := ioutil.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content \n ## test content 2"), 0666)
err := os.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content \n ## test content 2"), 0666)
if !assert.NoError(t, err) {
return
}

3
integrations/gpg_git_test.go
View file

@ -7,7 +7,6 @@ package integrations
import (
"encoding/base64"
"fmt"
"io/ioutil"
"net/url"
"os"
"testing"
@ -28,7 +27,7 @@ func TestGPGGit(t *testing.T) {
username := "user2"
// OK Set a new GPG home
tmpDir, err := ioutil.TempDir("", "temp-gpg")
tmpDir, err := os.MkdirTemp("", "temp-gpg")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)

4
integrations/lfs_getobject_test.go
View file

@ -7,7 +7,7 @@ package integrations
import (
"archive/zip"
"bytes"
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"testing"
@ -74,7 +74,7 @@ func checkResponseTestContentEncoding(t *testing.T, content *[]byte, resp *httpt
assert.Contains(t, contentEncoding, "gzip")
gzippReader, err := gzipp.NewReader(resp.Body)
assert.NoError(t, err)
result, err := ioutil.ReadAll(gzippReader)
result, err := io.ReadAll(gzippReader)
assert.NoError(t, err)
assert.Equal(t, *content, result)
}

7
integrations/lfs_local_endpoint_test.go
View file

@ -6,7 +6,6 @@ package integrations
import (
"fmt"
"io/ioutil"
"net/url"
"os"
"path/filepath"
@ -25,14 +24,14 @@ func str2url(raw string) *url.URL {
func TestDetermineLocalEndpoint(t *testing.T) {
defer prepareTestEnv(t)()
root, _ := ioutil.TempDir("", "lfs_test")
root, _ := os.MkdirTemp("", "lfs_test")
defer os.RemoveAll(root)
rootdotgit, _ := ioutil.TempDir("", "lfs_test")
rootdotgit, _ := os.MkdirTemp("", "lfs_test")
defer os.RemoveAll(rootdotgit)
os.Mkdir(filepath.Join(rootdotgit, ".git"), 0700)
lfsroot, _ := ioutil.TempDir("", "lfs_test")
lfsroot, _ := os.MkdirTemp("", "lfs_test")
defer os.RemoveAll(lfsroot)
// Test cases

5
integrations/migrate_test.go
View file

@ -5,7 +5,6 @@
package integrations
import (
"io/ioutil"
"os"
"testing"
@ -25,14 +24,14 @@ func TestMigrateLocalPath(t *testing.T) {
old := setting.ImportLocalPaths
setting.ImportLocalPaths = true
lowercasePath, err := ioutil.TempDir("", "lowercase") // may not be lowercase because TempDir creates a random directory name which may be mixedcase
lowercasePath, err := os.MkdirTemp("", "lowercase") // may not be lowercase because MkdirTemp creates a random directory name which may be mixedcase
assert.NoError(t, err)
defer os.RemoveAll(lowercasePath)
err = migrations.IsMigrateURLAllowed(lowercasePath, adminUser)
assert.NoError(t, err, "case lowercase path")
mixedcasePath, err := ioutil.TempDir("", "mIxeDCaSe")
mixedcasePath, err := os.MkdirTemp("", "mIxeDCaSe")
assert.NoError(t, err)
defer os.RemoveAll(mixedcasePath)

4
integrations/migration-test/migration_test.go
View file

@ -9,7 +9,7 @@ import (
"context"
"database/sql"
"fmt"
"io/ioutil"
"io"
"os"
"path"
"path/filepath"
@ -113,7 +113,7 @@ func readSQLFromFile(version string) (string, error) {
}
defer gr.Close()
bytes, err := ioutil.ReadAll(gr)
bytes, err := io.ReadAll(gr)
if err != nil {
return "", err
}

12
integrations/oauth_test.go
View file

@ -6,7 +6,7 @@ package integrations
import (
"bytes"
"io/ioutil"
"io"
"testing"
"code.gitea.io/gitea/modules/json"
@ -240,20 +240,20 @@ func TestRefreshTokenInvalidation(t *testing.T) {
"refresh_token": parsed.RefreshToken,
})
bs, err := ioutil.ReadAll(refreshReq.Body)
bs, err := io.ReadAll(refreshReq.Body)
assert.NoError(t, err)
refreshReq.Body = ioutil.NopCloser(bytes.NewReader(bs))
refreshReq.Body = io.NopCloser(bytes.NewReader(bs))
MakeRequest(t, refreshReq, 200)
refreshReq.Body = ioutil.NopCloser(bytes.NewReader(bs))
refreshReq.Body = io.NopCloser(bytes.NewReader(bs))
MakeRequest(t, refreshReq, 200)
// test with invalidation
setting.OAuth2.InvalidateRefreshTokens = true
refreshReq.Body = ioutil.NopCloser(bytes.NewReader(bs))
refreshReq.Body = io.NopCloser(bytes.NewReader(bs))
MakeRequest(t, refreshReq, 200)
refreshReq.Body = ioutil.NopCloser(bytes.NewReader(bs))
refreshReq.Body = io.NopCloser(bytes.NewReader(bs))
MakeRequest(t, refreshReq, 400)
}

4
integrations/repo_tag_test.go
View file

@ -5,8 +5,8 @@
package integrations
import (
"io/ioutil"
"net/url"
"os"
"testing"
"code.gitea.io/gitea/models"
@ -55,7 +55,7 @@ func TestCreateNewTagProtected(t *testing.T) {
username := "user2"
httpContext := NewAPITestContext(t, username, "repo1")
dstPath, err := ioutil.TempDir("", httpContext.Reponame)
dstPath, err := os.MkdirTemp("", httpContext.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)

16
integrations/ssh_key_test.go
View file

@ -6,9 +6,9 @@ package integrations
import (
"fmt"
"io/ioutil"
"net/http"
"net/url"
"os"
"path/filepath"
"testing"
"time"
@ -28,7 +28,7 @@ func doCheckRepositoryEmptyStatus(ctx APITestContext, isEmpty bool) func(*testin
func doAddChangesToCheckout(dstPath, filename string) func(*testing.T) {
return func(t *testing.T) {
assert.NoError(t, ioutil.WriteFile(filepath.Join(dstPath, filename), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s at time: %v", dstPath, time.Now())), 0644))
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, filename), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s at time: %v", dstPath, time.Now())), 0644))
assert.NoError(t, git.AddChanges(dstPath, true))
signature := git.Signature{
Email: "test@example.com",
@ -61,7 +61,7 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) {
t.Run("CreatePushDeployKey", doAPICreateDeployKey(ctx, keyname, keyFile, false))
// Setup the testing repository
dstPath, err := ioutil.TempDir("", "repo-tmp-deploy-key-empty-repo-1")
dstPath, err := os.MkdirTemp("", "repo-tmp-deploy-key-empty-repo-1")
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
@ -107,7 +107,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
withKeyFile(t, keyname, func(keyFile string) {
var userKeyPublicKeyID int64
t.Run("KeyCanOnlyBeUser", func(t *testing.T) {
dstPath, err := ioutil.TempDir("", ctx.Reponame)
dstPath, err := os.MkdirTemp("", ctx.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
@ -133,7 +133,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
})
t.Run("KeyCanBeAnyDeployButNotUserAswell", func(t *testing.T) {
dstPath, err := ioutil.TempDir("", ctx.Reponame)
dstPath, err := os.MkdirTemp("", ctx.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)
@ -151,7 +151,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
t.Run("FailToPush", doGitPushTestRepositoryFail(dstPath, "origin", "master"))
otherSSHURL := createSSHUrl(otherCtx.GitPath(), u)
dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame)
dstOtherPath, err := os.MkdirTemp("", otherCtx.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstOtherPath)
@ -168,7 +168,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
t.Run("DeleteRepositoryShouldReleaseKey", func(t *testing.T) {
otherSSHURL := createSSHUrl(otherCtx.GitPath(), u)
dstOtherPath, err := ioutil.TempDir("", otherCtx.Reponame)
dstOtherPath, err := os.MkdirTemp("", otherCtx.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstOtherPath)
@ -190,7 +190,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
userKeyPublicKeyID = publicKey.ID
}))
dstPath, err := ioutil.TempDir("", ctx.Reponame)
dstPath, err := os.MkdirTemp("", ctx.Reponame)
assert.NoError(t, err)
defer util.RemoveAll(dstPath)

5
models/db/unit_tests.go
View file

@ -6,7 +6,6 @@ package db
import (
"fmt"
"io/ioutil"
"math"
"net/url"
"os"
@ -57,11 +56,11 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
setting.SSH.Port = 3000
setting.SSH.Domain = "try.gitea.io"
setting.Database.UseSQLite3 = true
setting.RepoRootPath, err = ioutil.TempDir(os.TempDir(), "repos")
setting.RepoRootPath, err = os.MkdirTemp(os.TempDir(), "repos")
if err != nil {
fatalTestError("TempDir: %v\n", err)
}
setting.AppDataPath, err = ioutil.TempDir(os.TempDir(), "appdata")
setting.AppDataPath, err = os.MkdirTemp(os.TempDir(), "appdata")
if err != nil {
fatalTestError("TempDir: %v\n", err)
}

3
models/engine_test.go
View file

@ -5,7 +5,6 @@
package models
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@ -19,7 +18,7 @@ import (
func TestDumpDatabase(t *testing.T) {
assert.NoError(t, db.PrepareTestDatabase())
dir, err := ioutil.TempDir(os.TempDir(), "dump")
dir, err := os.MkdirTemp(os.TempDir(), "dump")
assert.NoError(t, err)
type Version struct {

4
models/fixture_test.go
View file

@ -5,7 +5,7 @@
package models
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@ -23,7 +23,7 @@ func TestFixtureGeneration(t *testing.T) {
if !assert.NoError(t, err) {
return
}
bytes, err := ioutil.ReadFile(filepath.Join(db.FixturesDir(), name+".yml"))
bytes, err := os.ReadFile(filepath.Join(db.FixturesDir(), name+".yml"))
if !assert.NoError(t, err) {
return
}

3
models/helper_directory.go
View file

@ -6,7 +6,6 @@ package models
import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
@ -30,7 +29,7 @@ func CreateTemporaryPath(prefix string) (string, error) {
log.Error("Unable to create localcopypath directory: %s (%v)", LocalCopyPath(), err)
return "", fmt.Errorf("Failed to create localcopypath directory %s: %v", LocalCopyPath(), err)
}
basePath, err := ioutil.TempDir(LocalCopyPath(), prefix+".git")
basePath, err := os.MkdirTemp(LocalCopyPath(), prefix+".git")
if err != nil {
log.Error("Unable to create temporary directory: %s-*.git (%v)", prefix, err)
return "", fmt.Errorf("Failed to create dir %s-*.git: %v", prefix, err)

10
models/migrations/v115.go
View file

@ -7,7 +7,7 @@ package migrations
import (
"crypto/md5"
"fmt"
"io/ioutil"
"io"
"math"
"os"
"path/filepath"
@ -141,9 +141,9 @@ func copyOldAvatarToNewLocation(userID int64, oldAvatar string) (string, error)
}
defer fr.Close()
data, err := ioutil.ReadAll(fr)
data, err := io.ReadAll(fr)
if err != nil {
return "", fmt.Errorf("ioutil.ReadAll: %v", err)
return "", fmt.Errorf("io.ReadAll: %v", err)
}
newAvatar := fmt.Sprintf("%x", md5.Sum([]byte(fmt.Sprintf("%d-%x", userID, md5.Sum(data)))))
@ -151,8 +151,8 @@ func copyOldAvatarToNewLocation(userID int64, oldAvatar string) (string, error)
return newAvatar, nil
}
if err := ioutil.WriteFile(filepath.Join(setting.Avatar.Path, newAvatar), data, 0o666); err != nil {
return "", fmt.Errorf("ioutil.WriteFile: %v", err)
if err := os.WriteFile(filepath.Join(setting.Avatar.Path, newAvatar), data, 0o666); err != nil {
return "", fmt.Errorf("os.WriteFile: %v", err)
}
return newAvatar, nil

9
models/repo.go
View file

@ -10,11 +10,7 @@ import (
"errors"
"fmt"
"html/template"
"unicode/utf8"
// Needed for jpeg support
_ "image/jpeg"
"io/ioutil"
_ "image/jpeg" // Needed for jpeg support
"net"
"net/url"
"os"
@ -24,6 +20,7 @@ import (
"strconv"
"strings"
"time"
"unicode/utf8"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/lfs"
@ -1013,7 +1010,7 @@ func GetRepoInitFile(tp, name string) ([]byte, error) {
log.Error("Unable to check if %s is a file. Error: %v", customPath, err)
}
if isFile {
return ioutil.ReadFile(customPath)
return os.ReadFile(customPath)
}
switch tp {

4
models/ssh_key_parse.go
View file

@ -13,8 +13,8 @@ import (
"encoding/pem"
"errors"
"fmt"
"io/ioutil"
"math/big"
"os"
"strconv"
"strings"
@ -263,7 +263,7 @@ func SSHNativeParsePublicKey(keyLine string) (string, int, error) {
// writeTmpKeyFile writes key content to a temporary file
// and returns the name of that file, along with any possible errors.
func writeTmpKeyFile(content string) (string, error) {
tmpFile, err := ioutil.TempFile(setting.SSH.KeyTestPath, "gitea_keytest")
tmpFile, err := os.CreateTemp(setting.SSH.KeyTestPath, "gitea_keytest")
if err != nil {
return "", fmt.Errorf("TempFile: %v", err)
}

8
modules/avatar/avatar_test.go
View file

@ -5,7 +5,7 @@
package avatar
import (
"io/ioutil"
"os"
"testing"
"code.gitea.io/gitea/modules/setting"
@ -30,7 +30,7 @@ func Test_PrepareWithPNG(t *testing.T) {
setting.Avatar.MaxWidth = 4096
setting.Avatar.MaxHeight = 4096
data, err := ioutil.ReadFile("testdata/avatar.png")
data, err := os.ReadFile("testdata/avatar.png")
assert.NoError(t, err)
imgPtr, err := Prepare(data)
@ -44,7 +44,7 @@ func Test_PrepareWithJPEG(t *testing.T) {
setting.Avatar.MaxWidth = 4096
setting.Avatar.MaxHeight = 4096
data, err := ioutil.ReadFile("testdata/avatar.jpeg")
data, err := os.ReadFile("testdata/avatar.jpeg")
assert.NoError(t, err)
imgPtr, err := Prepare(data)
@ -65,7 +65,7 @@ func Test_PrepareWithInvalidImageSize(t *testing.T) {
setting.Avatar.MaxWidth = 5
setting.Avatar.MaxHeight = 5
data, err := ioutil.ReadFile("testdata/avatar.png")
data, err := os.ReadFile("testdata/avatar.png")
assert.NoError(t, err)
_, err = Prepare(data)

3
modules/charset/charset.go
View file

@ -8,7 +8,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"strings"
"unicode/utf8"
@ -78,7 +77,7 @@ func ToUTF8WithErr(content []byte) (string, error) {
// ToUTF8WithFallback detects the encoding of content and coverts to UTF-8 if possible
func ToUTF8WithFallback(content []byte) []byte {
bs, _ := ioutil.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content)))
bs, _ := io.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content)))
return bs
}

4
modules/context/repo.go
View file

@ -8,7 +8,7 @@ package context
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/url"
"path"
"strings"
@ -915,7 +915,7 @@ func (ctx *Context) IssueTemplatesFromDefaultBranch() []api.IssueTemplate {
_ = r.Close()
}
}()
data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
if err != nil {
log.Debug("ReadAll: %v", err)
continue

3
modules/doctor/paths.go
View file

@ -6,7 +6,6 @@ package doctor
import (
"fmt"
"io/ioutil"
"os"
"code.gitea.io/gitea/modules/log"
@ -102,7 +101,7 @@ func isWritableDir(path string) error {
// There's no platform-independent way of checking if a directory is writable
// https://stackoverflow.com/questions/20026320/how-to-tell-if-folder-exists-and-is-writable
tmpFile, err := ioutil.TempFile(path, "doctors-order")
tmpFile, err := os.CreateTemp(path, "doctors-order")
if err != nil {
return err
}

4
modules/git/blame_test.go
View file

@ -6,7 +6,7 @@ package git
import (
"context"
"io/ioutil"
"os"
"testing"
"github.com/stretchr/testify/assert"
@ -84,7 +84,7 @@ e2aa991e10ffd924a828ec149951f2f20eecead2 7 7
`
func TestReadingBlameOutput(t *testing.T) {
tempFile, err := ioutil.TempFile("", ".txt")
tempFile, err := os.CreateTemp("", ".txt")
if err != nil {
panic(err)
}

3
modules/git/blob.go
View file

@ -9,7 +9,6 @@ import (
"bytes"
"encoding/base64"
"io"
"io/ioutil"
"code.gitea.io/gitea/modules/typesniffer"
)
@ -83,7 +82,7 @@ func (b *Blob) GetBlobContentBase64() (string, error) {
}
}()
out, err := ioutil.ReadAll(pr)
out, err := io.ReadAll(pr)
if err != nil {
return "", err
}

5
modules/git/blob_nogogit.go
View file

@ -11,7 +11,6 @@ import (
"bufio"
"bytes"
"io"
"io/ioutil"
"math"
"code.gitea.io/gitea/modules/log"
@ -46,13 +45,13 @@ func (b *Blob) DataAsync() (io.ReadCloser, error) {
b.size = size
if size < 4096 {
bs, err := ioutil.ReadAll(io.LimitReader(rd, size))
bs, err := io.ReadAll(io.LimitReader(rd, size))
defer cancel()
if err != nil {
return nil, err
}
_, err = rd.Discard(1)
return ioutil.NopCloser(bytes.NewReader(bs)), err
return io.NopCloser(bytes.NewReader(bs)), err
}
return &blobReader{

6
modules/git/blob_test.go
View file

@ -6,7 +6,7 @@
package git
import (
"io/ioutil"
"io"
"path/filepath"
"testing"
@ -30,7 +30,7 @@ func TestBlob_Data(t *testing.T) {
assert.NoError(t, err)
require.NotNil(t, r)
data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
assert.NoError(t, r.Close())
assert.NoError(t, err)
@ -55,7 +55,7 @@ func Benchmark_Blob_Data(b *testing.B) {
if err != nil {
b.Fatal(err)
}
ioutil.ReadAll(r)
io.ReadAll(r)
_ = r.Close()
}
}

9
modules/git/hook.go
View file

@ -7,7 +7,6 @@ package git
import (
"errors"
"io/ioutil"
"os"
"path"
"path/filepath"
@ -59,14 +58,14 @@ func GetHook(repoPath, name string) (*Hook, error) {
}
samplePath := filepath.Join(repoPath, "hooks", name+".sample")
if isFile(h.path) {
data, err := ioutil.ReadFile(h.path)
data, err := os.ReadFile(h.path)
if err != nil {
return nil, err
}
h.IsActive = true
h.Content = string(data)
} else if isFile(samplePath) {
data, err := ioutil.ReadFile(samplePath)
data, err := os.ReadFile(samplePath)
if err != nil {
return nil, err
}
@ -97,7 +96,7 @@ func (h *Hook) Update() error {
return err
}
err := ioutil.WriteFile(h.path, []byte(strings.ReplaceAll(h.Content, "\r", "")), os.ModePerm)
err := os.WriteFile(h.path, []byte(strings.ReplaceAll(h.Content, "\r", "")), os.ModePerm)
if err != nil {
return err
}
@ -143,5 +142,5 @@ func SetUpdateHook(repoPath, content string) (err error) {
if err != nil {
return err
}
return ioutil.WriteFile(hookPath, []byte(content), 0777)
return os.WriteFile(hookPath, []byte(content), 0777)
}

4
modules/git/notes_gogit.go
View file

@ -9,7 +9,7 @@ package git
import (
"context"
"io/ioutil"
"io"
"code.gitea.io/gitea/modules/log"
@ -58,7 +58,7 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
}
defer dataRc.Close()
d, err := ioutil.ReadAll(dataRc)
d, err := io.ReadAll(dataRc)
if err != nil {
log.Error("Unable to read blob with ID %q. Error: %v", blob.ID, err)
return err

4
modules/git/notes_nogogit.go
View file

@ -9,7 +9,7 @@ package git
import (
"context"
"io/ioutil"
"io"
"strings"
"code.gitea.io/gitea/modules/log"
@ -60,7 +60,7 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
_ = dataRc.Close()
}
}()
d, err := ioutil.ReadAll(dataRc)
d, err := io.ReadAll(dataRc)
if err != nil {
log.Error("Unable to read blob with ID %q. Error: %v", blob.ID, err)
return err

4
modules/git/repo_blob_test.go
View file

@ -6,7 +6,7 @@ package git
import (
"fmt"
"io/ioutil"
"io"
"path/filepath"
"testing"
@ -34,7 +34,7 @@ func TestRepository_GetBlob_Found(t *testing.T) {
dataReader, err := blob.DataAsync()
assert.NoError(t, err)
data, err := ioutil.ReadAll(dataReader)
data, err := io.ReadAll(dataReader)
assert.NoError(t, dataReader.Close())
assert.NoError(t, err)
assert.Equal(t, testCase.Data, data)

5
modules/git/repo_commit.go
View file

@ -8,7 +8,6 @@ package git
import (
"bytes"
"io"
"io/ioutil"
"strconv"
"strings"
@ -222,7 +221,7 @@ func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (
}()
if skip > 0 {
_, err := io.CopyN(ioutil.Discard, stdoutReader, int64(skip*41))
_, err := io.CopyN(io.Discard, stdoutReader, int64(skip*41))
if err != nil {
if err == io.EOF {
return []*Commit{}, nil
@ -232,7 +231,7 @@ func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (
}
}
stdout, err := ioutil.ReadAll(stdoutReader)
stdout, err := io.ReadAll(stdoutReader)
if err != nil {
return nil, err
}

3
modules/git/repo_commit_nogogit.go
View file

@ -11,7 +11,6 @@ import (
"bufio"
"errors"
"io"
"io/ioutil"
"strings"
"code.gitea.io/gitea/modules/log"
@ -77,7 +76,7 @@ func (repo *Repository) getCommitFromBatchReader(rd *bufio.Reader, id SHA1) (*Co
case "tag":
// then we need to parse the tag
// and load the commit
data, err := ioutil.ReadAll(io.LimitReader(rd, size))
data, err := io.ReadAll(io.LimitReader(rd, size))
if err != nil {
return nil, err
}

4
modules/git/repo_compare_test.go
View file

@ -6,7 +6,7 @@ package git
import (
"bytes"
"io/ioutil"
"io"
"path/filepath"
"testing"
@ -25,7 +25,7 @@ func TestGetFormatPatch(t *testing.T) {
rd := &bytes.Buffer{}
err = repo.GetPatch("8d92fc95^", "8d92fc95", rd)
assert.NoError(t, err)
patchb, err := ioutil.ReadAll(rd)
patchb, err := io.ReadAll(rd)
assert.NoError(t, err)
patch := string(patchb)
assert.Regexp(t, "^From 8d92fc95", patch)

3
modules/git/repo_index.go
View file

@ -7,7 +7,6 @@ package git
import (
"bytes"
"context"
"io/ioutil"
"os"
"strings"
@ -47,7 +46,7 @@ func (repo *Repository) readTreeToIndex(id SHA1, indexFilename ...string) error
// ReadTreeToTemporaryIndex reads a treeish to a temporary index file
func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename string, cancel context.CancelFunc, err error) {
tmpIndex, err := ioutil.TempFile("", "index")
tmpIndex, err := os.CreateTemp("", "index")
if err != nil {
return
}

6
modules/git/repo_language_stats_gogit.go
View file

@ -11,7 +11,7 @@ import (
"bytes"
"context"
"io"
"io/ioutil"
"os"
"code.gitea.io/gitea/modules/analyze"
"code.gitea.io/gitea/modules/log"
@ -51,7 +51,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
indexFilename, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
if err == nil {
defer deleteTemporaryFile()
tmpWorkTree, err := ioutil.TempDir("", "empty-work-dir")
tmpWorkTree, err := os.MkdirTemp("", "empty-work-dir")
if err == nil {
defer func() {
_ = util.RemoveAll(tmpWorkTree)
@ -174,7 +174,7 @@ func readFile(f *object.File, limit int64) ([]byte, error) {
defer r.Close()
if limit <= 0 {
return ioutil.ReadAll(r)
return io.ReadAll(r)
}
size := f.Size

4
modules/git/repo_language_stats_nogogit.go
View file

@ -12,8 +12,8 @@ import (
"bytes"
"context"
"io"
"io/ioutil"
"math"
"os"
"code.gitea.io/gitea/modules/analyze"
"code.gitea.io/gitea/modules/log"
@ -71,7 +71,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
indexFilename, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
if err == nil {
defer deleteTemporaryFile()
tmpWorkTree, err := ioutil.TempDir("", "empty-work-dir")
tmpWorkTree, err := os.MkdirTemp("", "empty-work-dir")
if err == nil {
defer func() {
_ = util.RemoveAll(tmpWorkTree)

3
modules/git/repo_tree_nogogit.go
View file

@ -9,7 +9,6 @@ package git
import (
"io"
"io/ioutil"
)
func (repo *Repository) getTree(id SHA1) (*Tree, error) {
@ -27,7 +26,7 @@ func (repo *Repository) getTree(id SHA1) (*Tree, error) {
switch typ {
case "tag":
resolvedID := id
data, err := ioutil.ReadAll(io.LimitReader(rd, size))
data, err := io.ReadAll(io.LimitReader(rd, size))
if err != nil {
return nil, err
}

5
modules/graceful/server.go
View file

@ -7,7 +7,6 @@ package graceful
import (
"crypto/tls"
"io/ioutil"
"net"
"os"
"strings"
@ -111,13 +110,13 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string, serve ServeFuncti
config.Certificates = make([]tls.Certificate, 1)
certPEMBlock, err := ioutil.ReadFile(certFile)
certPEMBlock, err := os.ReadFile(certFile)
if err != nil {
log.Error("Failed to load https cert file %s for %s:%s: %v", certFile, srv.network, srv.address, err)
return err
}
keyPEMBlock, err := ioutil.ReadFile(keyFile)
keyPEMBlock, err := os.ReadFile(keyFile)
if err != nil {
log.Error("Failed to load https key file %s for %s:%s: %v", keyFile, srv.network, srv.address, err)
return err

9
modules/httplib/httplib.go
View file

@ -11,7 +11,6 @@ import (
"crypto/tls"
"encoding/xml"
"io"
"io/ioutil"
"log"
"mime/multipart"
"net"
@ -243,11 +242,11 @@ func (r *Request) Body(data interface{}) *Request {
switch t := data.(type) {
case string:
bf := bytes.NewBufferString(t)
r.req.Body = ioutil.NopCloser(bf)
r.req.Body = io.NopCloser(bf)
r.req.ContentLength = int64(len(t))
case []byte:
bf := bytes.NewBuffer(t)
r.req.Body = ioutil.NopCloser(bf)
r.req.Body = io.NopCloser(bf)
r.req.ContentLength = int64(len(t))
}
return r
@ -307,7 +306,7 @@ func (r *Request) getResponse() (*http.Response, error) {
_ = pw.Close()
}()
r.Header("Content-Type", bodyWriter.FormDataContentType())
r.req.Body = ioutil.NopCloser(pr)
r.req.Body = io.NopCloser(pr)
} else if len(paramBody) > 0 {
r.Header("Content-Type", "application/x-www-form-urlencoded")
r.Body(paramBody)
@ -407,7 +406,7 @@ func (r *Request) Bytes() ([]byte, error) {
return nil, nil
}
defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body)
data, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}

3
modules/indexer/code/bleve.go
View file

@ -8,7 +8,6 @@ import (
"bufio"
"fmt"
"io"
"io/ioutil"
"os"
"strconv"
"strings"
@ -210,7 +209,7 @@ func (b *BleveIndexer) addUpdate(batchWriter git.WriteCloserError, batchReader *
return err
}
fileContents, err := ioutil.ReadAll(io.LimitReader(batchReader, size))
fileContents, err := io.ReadAll(io.LimitReader(batchReader, size))
if err != nil {
return err
} else if !typesniffer.DetectContentType(fileContents).IsText() {

4
modules/indexer/code/bleve_test.go
View file

@ -5,7 +5,7 @@
package code
import (
"io/ioutil"
"os"
"testing"
"code.gitea.io/gitea/models/db"
@ -17,7 +17,7 @@ import (
func TestBleveIndexAndSearch(t *testing.T) {
db.PrepareTestEnv(t)
dir, err := ioutil.TempDir("", "bleve.index")
dir, err := os.MkdirTemp("", "bleve.index")
assert.NoError(t, err)
if err != nil {
assert.Fail(t, "Unable to create temporary directory")

3
modules/indexer/code/elastic_search.go
View file

@ -9,7 +9,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"strconv"
"strings"
"time"
@ -207,7 +206,7 @@ func (b *ElasticSearchIndexer) addUpdate(batchWriter git.WriteCloserError, batch
return nil, err
}
fileContents, err := ioutil.ReadAll(io.LimitReader(batchReader, size))
fileContents, err := io.ReadAll(io.LimitReader(batchReader, size))
if err != nil {
return nil, err
} else if !typesniffer.DetectContentType(fileContents).IsText() {

4
modules/indexer/issues/bleve_test.go
View file

@ -5,7 +5,7 @@
package issues
import (
"io/ioutil"
"os"
"testing"
"code.gitea.io/gitea/modules/util"
@ -13,7 +13,7 @@ import (
)
func TestBleveIndexAndSearch(t *testing.T) {
dir, err := ioutil.TempDir("", "bleve.index")
dir, err := os.MkdirTemp("", "bleve.index")
assert.NoError(t, err)
if err != nil {
assert.Fail(t, "Unable to create temporary directory")

4
modules/indexer/issues/indexer_test.go
View file

@ -5,7 +5,7 @@
package issues
import (
"io/ioutil"
"os"
"path"
"path/filepath"
"testing"
@ -28,7 +28,7 @@ func TestBleveSearchIssues(t *testing.T) {
assert.NoError(t, db.PrepareTestDatabase())
setting.Cfg = ini.Empty()
tmpIndexerDir, err := ioutil.TempDir("", "issues-indexer")
tmpIndexerDir, err := os.MkdirTemp("", "issues-indexer")
if err != nil {
assert.Fail(t, "Unable to create temporary directory: %v", err)
return

9
modules/lfs/http_client_test.go
View file

@ -8,7 +8,6 @@ import (
"bytes"
"context"
"io"
"io/ioutil"
"net/http"
"strings"
"testing"
@ -32,7 +31,7 @@ func (a *DummyTransferAdapter) Name() string {
}
func (a *DummyTransferAdapter) Download(ctx context.Context, l *Link) (io.ReadCloser, error) {
return ioutil.NopCloser(bytes.NewBufferString("dummy")), nil
return io.NopCloser(bytes.NewBufferString("dummy")), nil
}
func (a *DummyTransferAdapter) Upload(ctx context.Context, l *Link, p Pointer, r io.Reader) error {
@ -50,7 +49,7 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
if strings.Contains(url, "status-not-ok") {
return &http.Response{StatusCode: http.StatusBadRequest}
} else if strings.Contains(url, "invalid-json-response") {
return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(bytes.NewBufferString("invalid json"))}
return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(bytes.NewBufferString("invalid json"))}
} else if strings.Contains(url, "valid-batch-request-download") {
batchResponse = &BatchResponse{
Transfer: "dummy",
@ -149,7 +148,7 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
payload := new(bytes.Buffer)
json.NewEncoder(payload).Encode(batchResponse)
return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(payload)}
return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(payload)}
}
func TestHTTPClientDownload(t *testing.T) {
@ -350,7 +349,7 @@ func TestHTTPClientUpload(t *testing.T) {
client.transfers["dummy"] = dummy
err := client.Upload(context.Background(), []Pointer{p}, func(p Pointer, objectError error) (io.ReadCloser, error) {
return ioutil.NopCloser(new(bytes.Buffer)), objectError
return io.NopCloser(new(bytes.Buffer)), objectError
})
if len(c.expectederror) > 0 {
assert.True(t, strings.Contains(err.Error(), c.expectederror), "case %d: '%s' should contain '%s'", n, err.Error(), c.expectederror)

5
modules/lfs/transferadapter_test.go
View file

@ -8,7 +8,6 @@ import (
"bytes"
"context"
"io"
"io/ioutil"
"net/http"
"strings"
"testing"
@ -35,7 +34,7 @@ func TestBasicTransferAdapter(t *testing.T) {
if strings.Contains(url, "download-request") {
assert.Equal(t, "GET", req.Method)
return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(bytes.NewBufferString("dummy"))}
return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(bytes.NewBufferString("dummy"))}
} else if strings.Contains(url, "upload-request") {
assert.Equal(t, "PUT", req.Method)
assert.Equal(t, "application/octet-stream", req.Header.Get("Content-Type"))
@ -63,7 +62,7 @@ func TestBasicTransferAdapter(t *testing.T) {
payload := new(bytes.Buffer)
json.NewEncoder(payload).Encode(er)
return &http.Response{StatusCode: http.StatusNotFound, Body: ioutil.NopCloser(payload)}
return &http.Response{StatusCode: http.StatusNotFound, Body: io.NopCloser(payload)}
} else {
t.Errorf("Unknown test case: %s", url)
return nil

4
modules/log/conn_test.go
View file

@ -6,7 +6,7 @@ package log
import (
"fmt"
"io/ioutil"
"io"
"net"
"strings"
"sync"
@ -20,7 +20,7 @@ func listenReadAndClose(t *testing.T, l net.Listener, expected string) {
conn, err := l.Accept()
assert.NoError(t, err)
defer conn.Close()
written, err := ioutil.ReadAll(conn)
written, err := io.ReadAll(conn)
assert.NoError(t, err)
assert.Equal(t, expected, string(written))

34
modules/log/file_test.go
View file

@ -7,7 +7,7 @@ package log
import (
"compress/gzip"
"fmt"
"io/ioutil"
"io"
"os"
"path/filepath"
"strings"
@ -19,7 +19,7 @@ import (
)
func TestFileLoggerFails(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger")
tmpDir, err := os.MkdirTemp("", "TestFileLogger")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
@ -47,7 +47,7 @@ func TestFileLoggerFails(t *testing.T) {
}
func TestFileLogger(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger")
tmpDir, err := os.MkdirTemp("", "TestFileLogger")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
@ -85,21 +85,21 @@ func TestFileLogger(t *testing.T) {
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err := ioutil.ReadFile(filename)
logData, err := os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
event.level = DEBUG
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
event.level = TRACE
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
@ -107,18 +107,18 @@ func TestFileLogger(t *testing.T) {
expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
// Should rotate
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1))
logData, err = os.ReadFile(filename + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1))
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
expected = fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
assert.Equal(t, expected, string(logData))
@ -134,7 +134,7 @@ func TestFileLogger(t *testing.T) {
expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
@ -142,7 +142,7 @@ func TestFileLogger(t *testing.T) {
expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
@ -150,7 +150,7 @@ func TestFileLogger(t *testing.T) {
}
func TestCompressFileLogger(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger")
tmpDir, err := os.MkdirTemp("", "TestFileLogger")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
@ -184,7 +184,7 @@ func TestCompressFileLogger(t *testing.T) {
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err := ioutil.ReadFile(filename)
logData, err := os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
@ -192,7 +192,7 @@ func TestCompressFileLogger(t *testing.T) {
expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
logData, err = os.ReadFile(filename)
assert.NoError(t, err)
assert.Equal(t, expected, string(logData))
@ -210,7 +210,7 @@ func TestCompressFileLogger(t *testing.T) {
}
func TestCompressOldFile(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "TestFileLogger")
tmpDir, err := os.MkdirTemp("", "TestFileLogger")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)
fname := filepath.Join(tmpDir, "test")
@ -238,9 +238,9 @@ func TestCompressOldFile(t *testing.T) {
assert.NoError(t, err)
zr, err := gzip.NewReader(f)
assert.NoError(t, err)
data, err := ioutil.ReadAll(zr)
data, err := io.ReadAll(zr)
assert.NoError(t, err)
original, err := ioutil.ReadFile(nonGzip)
original, err := os.ReadFile(nonGzip)
assert.NoError(t, err)
assert.Equal(t, original, data)
}

4
modules/log/stack.go
View file

@ -7,7 +7,7 @@ package log
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"runtime"
)
@ -38,7 +38,7 @@ func Stack(skip int) string {
fmt.Fprintf(buf, "%s:%d (0x%x)\n", filename, lineNumber, programCounter)
// Now try to print the offending line
if filename != lastFilename {
data, err := ioutil.ReadFile(filename)
data, err := os.ReadFile(filename)
if err != nil {
// can't read this sourcefile
// likely we don't have the sourcecode available

3
modules/markup/csv/csv.go
View file

@ -9,7 +9,6 @@ import (
"bytes"
"html"
"io"
"io/ioutil"
"regexp"
"strconv"
@ -87,7 +86,7 @@ func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Wri
var tmpBlock = bufio.NewWriter(output)
// FIXME: don't read all to memory
rawBytes, err := ioutil.ReadAll(input)
rawBytes, err := io.ReadAll(input)
if err != nil {
return err
}

3
modules/markup/external/external.go vendored
View file

@ -8,7 +8,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"os"
"os/exec"
"runtime"
@ -75,7 +74,7 @@ func (p *Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.
if p.IsInputFile {
// write to temp file
f, err := ioutil.TempFile("", "gitea_input")
f, err := os.CreateTemp("", "gitea_input")
if err != nil {
return fmt.Errorf("%s create temp file when rendering %s failed: %v", p.Name(), p.Command, err)
}

3
modules/markup/html.go
View file

@ -7,7 +7,6 @@ package markup
import (
"bytes"
"io"
"io/ioutil"
"net/url"
"path"
"path/filepath"
@ -290,7 +289,7 @@ var nulCleaner = strings.NewReplacer("\000", "")
func postProcess(ctx *RenderContext, procs []processor, input io.Reader, output io.Writer) error {
defer ctx.Cancel()
// FIXME: don't read all content to memory
rawHTML, err := ioutil.ReadAll(input)
rawHTML, err := io.ReadAll(input)
if err != nil {
return err
}

3
modules/markup/markdown/markdown.go
View file

@ -8,7 +8,6 @@ package markdown
import (
"fmt"
"io"
"io/ioutil"
"strings"
"sync"
@ -189,7 +188,7 @@ func actualRender(ctx *markup.RenderContext, input io.Reader, output io.Writer)
// FIXME: Don't read all to memory, but goldmark doesn't support
pc := newParserContext(ctx)
buf, err := ioutil.ReadAll(input)
buf, err := io.ReadAll(input)
if err != nil {
log.Error("Unable to ReadAll: %v", err)
return

19
modules/migrations/restore.go
View file

@ -7,7 +7,6 @@ package migrations
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strconv"
@ -55,7 +54,7 @@ func (r *RepositoryRestorer) SetContext(ctx context.Context) {
func (r *RepositoryRestorer) getRepoOptions() (map[string]string, error) {
p := filepath.Join(r.baseDir, "repo.yml")
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, err
}
@ -96,7 +95,7 @@ func (r *RepositoryRestorer) GetTopics() ([]string, error) {
Topics []string `yaml:"topics"`
}{}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, err
}
@ -120,7 +119,7 @@ func (r *RepositoryRestorer) GetMilestones() ([]*base.Milestone, error) {
return nil, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, err
}
@ -144,7 +143,7 @@ func (r *RepositoryRestorer) GetReleases() ([]*base.Release, error) {
return nil, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, err
}
@ -175,7 +174,7 @@ func (r *RepositoryRestorer) GetLabels() ([]*base.Label, error) {
return nil, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, err
}
@ -199,7 +198,7 @@ func (r *RepositoryRestorer) GetIssues(page, perPage int) ([]*base.Issue, bool,
return nil, false, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, false, err
}
@ -226,7 +225,7 @@ func (r *RepositoryRestorer) GetComments(opts base.GetCommentOptions) ([]*base.C
return nil, false, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, false, err
}
@ -250,7 +249,7 @@ func (r *RepositoryRestorer) GetPullRequests(page, perPage int) ([]*base.PullReq
return nil, false, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, false, err
}
@ -278,7 +277,7 @@ func (r *RepositoryRestorer) GetReviews(context base.IssueContext) ([]*base.Revi
return nil, err
}
bs, err := ioutil.ReadFile(p)
bs, err := os.ReadFile(p)
if err != nil {
return nil, err
}

6
modules/options/dynamic.go
View file

@ -9,7 +9,7 @@ package options
import (
"fmt"
"io/ioutil"
"os"
"path"
"code.gitea.io/gitea/modules/log"
@ -100,7 +100,7 @@ func fileFromDir(name string) ([]byte, error) {
log.Error("Unable to check if %s is a file. Error: %v", customPath, err)
}
if isFile {
return ioutil.ReadFile(customPath)
return os.ReadFile(customPath)
}
staticPath := path.Join(setting.StaticRootPath, "options", name)
@ -110,7 +110,7 @@ func fileFromDir(name string) ([]byte, error) {
log.Error("Unable to check if %s is a file. Error: %v", staticPath, err)
}
if isFile {
return ioutil.ReadFile(staticPath)
return os.ReadFile(staticPath)
}
return []byte{}, fmt.Errorf("Asset file does not exist: %s", name)

9
modules/options/static.go
View file

@ -9,7 +9,8 @@ package options
import (
"fmt"
"io/ioutil"
"io"
"os"
"path"
"code.gitea.io/gitea/modules/log"
@ -109,7 +110,7 @@ func fileFromDir(name string) ([]byte, error) {
log.Error("Unable to check if %s is a file. Error: %v", customPath, err)
}
if isFile {
return ioutil.ReadFile(customPath)
return os.ReadFile(customPath)
}
f, err := Assets.Open(name)
@ -118,7 +119,7 @@ func fileFromDir(name string) ([]byte, error) {
}
defer f.Close()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}
func Asset(name string) ([]byte, error) {
@ -127,7 +128,7 @@ func Asset(name string) ([]byte, error) {
return nil, err
}
defer f.Close()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}
func AssetNames() []string {

6
modules/pprof/pprof.go
View file

@ -6,7 +6,7 @@ package pprof
import (
"fmt"
"io/ioutil"
"os"
"runtime"
"runtime/pprof"
@ -15,7 +15,7 @@ import (
// DumpMemProfileForUsername dumps a memory profile at pprofDataPath as memprofile_<username>_<temporary id>
func DumpMemProfileForUsername(pprofDataPath, username string) error {
f, err := ioutil.TempFile(pprofDataPath, fmt.Sprintf("memprofile_%s_", username))
f, err := os.CreateTemp(pprofDataPath, fmt.Sprintf("memprofile_%s_", username))
if err != nil {
return err
}
@ -27,7 +27,7 @@ func DumpMemProfileForUsername(pprofDataPath, username string) error {
// DumpCPUProfileForUsername dumps a CPU profile at pprofDataPath as cpuprofile_<username>_<temporary id>
// it returns the stop function which stops, writes and closes the CPU profile file
func DumpCPUProfileForUsername(pprofDataPath, username string) (func(), error) {
f, err := ioutil.TempFile(pprofDataPath, fmt.Sprintf("cpuprofile_%s_", username))
f, err := os.CreateTemp(pprofDataPath, fmt.Sprintf("cpuprofile_%s_", username))
if err != nil {
return nil, err
}

4
modules/private/key.go
View file

@ -7,7 +7,7 @@ package private
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"code.gitea.io/gitea/modules/setting"
@ -49,7 +49,7 @@ func AuthorizedPublicKeyByContent(ctx context.Context, content string) (string,
if resp.StatusCode != http.StatusOK {
return "", fmt.Errorf("Failed to update public key: %s", decodeJSONError(resp).Err)
}
bs, err := ioutil.ReadAll(resp.Body)
bs, err := io.ReadAll(resp.Body)
return string(bs), err
}

4
modules/private/mail.go
View file

@ -7,7 +7,7 @@ package private
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"code.gitea.io/gitea/modules/json"
@ -45,7 +45,7 @@ func SendEmail(ctx context.Context, subject, message string, to []string) (int,
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return http.StatusInternalServerError, fmt.Sprintf("Response body error: %v", err.Error())
}

4
modules/private/restore_repo.go
View file

@ -7,7 +7,7 @@ package private
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"time"
@ -47,7 +47,7 @@ func RestoreRepo(ctx context.Context, repoDir, ownerName, repoName string, units
var ret = struct {
Err string `json:"err"`
}{}
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return http.StatusInternalServerError, fmt.Sprintf("Response body error: %v", err.Error())
}

3
modules/public/static.go
View file

@ -11,7 +11,6 @@ import (
"bytes"
"compress/gzip"
"io"
"io/ioutil"
"mime"
"net/http"
"os"
@ -31,7 +30,7 @@ func Asset(name string) ([]byte, error) {
return nil, err
}
defer f.Close()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}
func AssetNames() []string {

4
modules/queue/queue_disk_channel_test.go
View file

@ -5,7 +5,7 @@
package queue
import (
"io/ioutil"
"os"
"sync"
"testing"
@ -26,7 +26,7 @@ func TestPersistableChannelQueue(t *testing.T) {
queueShutdown := []func(){}
queueTerminate := []func(){}
tmpDir, err := ioutil.TempDir("", "persistable-channel-queue-test-data")
tmpDir, err := os.MkdirTemp("", "persistable-channel-queue-test-data")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)

4
modules/queue/queue_disk_test.go
View file

@ -5,7 +5,7 @@
package queue
import (
"io/ioutil"
"os"
"sync"
"testing"
"time"
@ -28,7 +28,7 @@ func TestLevelQueue(t *testing.T) {
queueShutdown := []func(){}
queueTerminate := []func(){}
tmpDir, err := ioutil.TempDir("", "level-queue-test-data")
tmpDir, err := os.MkdirTemp("", "level-queue-test-data")
assert.NoError(t, err)
defer util.RemoveAll(tmpDir)

4
modules/recaptcha/recaptcha.go
View file

@ -7,7 +7,7 @@ package recaptcha
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"strings"
@ -46,7 +46,7 @@ func Verify(ctx context.Context, response string) (bool, error) {
return false, fmt.Errorf("Failed to send CAPTCHA response: %s", err)
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return false, fmt.Errorf("Failed to read CAPTCHA response: %s", err)
}

9
modules/repository/generate.go
View file

@ -6,7 +6,6 @@ package repository
import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
@ -85,7 +84,7 @@ func checkGiteaTemplate(tmpDir string) (*models.GiteaTemplate, error) {
return nil, err
}
content, err := ioutil.ReadFile(gtPath)
content, err := os.ReadFile(gtPath)
if err != nil {
return nil, err
}
@ -151,12 +150,12 @@ func generateRepoCommit(repo, templateRepo, generateRepo *models.Repository, tmp
base := strings.TrimPrefix(filepath.ToSlash(path), tmpDirSlash)
for _, g := range gt.Globs() {
if g.Match(base) {
content, err := ioutil.ReadFile(path)
content, err := os.ReadFile(path)
if err != nil {
return err
}
if err := ioutil.WriteFile(path,
if err := os.WriteFile(path,
[]byte(generateExpansion(string(content), templateRepo, generateRepo)),
0644); err != nil {
return err
@ -187,7 +186,7 @@ func generateRepoCommit(repo, templateRepo, generateRepo *models.Repository, tmp
}
func generateGitContent(ctx *db.Context, repo, templateRepo, generateRepo *models.Repository) (err error) {
tmpDir, err := ioutil.TempDir(os.TempDir(), "gitea-"+repo.Name)
tmpDir, err := os.MkdirTemp(os.TempDir(), "gitea-"+repo.Name)
if err != nil {
return fmt.Errorf("Failed to create temp dir for repository %s: %v", repo.RepoPath(), err)
}

9
modules/repository/hooks.go
View file

@ -7,7 +7,6 @@ package repository
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -110,7 +109,7 @@ func createDelegateHooks(repoPath string) (err error) {
if err = util.Remove(oldHookPath); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("unable to pre-remove old hook file '%s' prior to rewriting: %v ", oldHookPath, err)
}
if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil {
if err = os.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil {
return fmt.Errorf("write old hook file '%s': %v", oldHookPath, err)
}
@ -121,7 +120,7 @@ func createDelegateHooks(repoPath string) (err error) {
if err = util.Remove(newHookPath); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("unable to pre-remove new hook file '%s' prior to rewriting: %v", newHookPath, err)
}
if err = ioutil.WriteFile(newHookPath, []byte(giteaHookTpls[i]), 0777); err != nil {
if err = os.WriteFile(newHookPath, []byte(giteaHookTpls[i]), 0777); err != nil {
return fmt.Errorf("write new hook file '%s': %v", newHookPath, err)
}
@ -192,7 +191,7 @@ func CheckDelegateHooks(repoPath string) ([]string, error) {
if cont {
continue
}
contents, err := ioutil.ReadFile(oldHookPath)
contents, err := os.ReadFile(oldHookPath)
if err != nil {
return results, err
}
@ -202,7 +201,7 @@ func CheckDelegateHooks(repoPath string) ([]string, error) {
if !checkExecutable(oldHookPath) {
results = append(results, fmt.Sprintf("old hook file %s is not executable", oldHookPath))
}
contents, err = ioutil.ReadFile(newHookPath)
contents, err = os.ReadFile(newHookPath)
if err != nil {
return results, err
}

9
modules/repository/init.go
View file

@ -7,7 +7,6 @@ package repository
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
@ -59,7 +58,7 @@ func prepareRepoCommit(ctx *db.Context, repo *models.Repository, tmpDir, repoPat
"CloneURL.HTTPS": cloneLink.HTTPS,
"OwnerName": repo.OwnerName,
}
if err = ioutil.WriteFile(filepath.Join(tmpDir, "README.md"),
if err = os.WriteFile(filepath.Join(tmpDir, "README.md"),
[]byte(com.Expand(string(data), match)), 0644); err != nil {
return fmt.Errorf("write README.md: %v", err)
}
@ -79,7 +78,7 @@ func prepareRepoCommit(ctx *db.Context, repo *models.Repository, tmpDir, repoPat
}
if buf.Len() > 0 {
if err = ioutil.WriteFile(filepath.Join(tmpDir, ".gitignore"), buf.Bytes(), 0644); err != nil {
if err = os.WriteFile(filepath.Join(tmpDir, ".gitignore"), buf.Bytes(), 0644); err != nil {
return fmt.Errorf("write .gitignore: %v", err)
}
}
@ -92,7 +91,7 @@ func prepareRepoCommit(ctx *db.Context, repo *models.Repository, tmpDir, repoPat
return fmt.Errorf("GetRepoInitFile[%s]: %v", opts.License, err)
}
if err = ioutil.WriteFile(filepath.Join(tmpDir, "LICENSE"), data, 0644); err != nil {
if err = os.WriteFile(filepath.Join(tmpDir, "LICENSE"), data, 0644); err != nil {
return fmt.Errorf("write LICENSE: %v", err)
}
}
@ -291,7 +290,7 @@ func initRepository(ctx *db.Context, repoPath string, u *models.User, repo *mode
// Initialize repository according to user's choice.
if opts.AutoInit {
tmpDir, err := ioutil.TempDir(os.TempDir(), "gitea-"+repo.Name)
tmpDir, err := os.MkdirTemp(os.TempDir(), "gitea-"+repo.Name)
if err != nil {
return fmt.Errorf("Failed to create temp dir for repository %s: %v", repo.RepoPath(), err)
}

5
modules/setting/setting.go
View file

@ -9,7 +9,6 @@ import (
"encoding/base64"
"fmt"
"io"
"io/ioutil"
"math"
"net"
"net/url"
@ -764,7 +763,7 @@ func NewContext() {
if len(trustedUserCaKeys) > 0 && SSH.AuthorizedPrincipalsEnabled {
fname := sec.Key("SSH_TRUSTED_USER_CA_KEYS_FILENAME").MustString(filepath.Join(SSH.RootPath, "gitea-trusted-user-ca-keys.pem"))
if err := ioutil.WriteFile(fname,
if err := os.WriteFile(fname,
[]byte(strings.Join(trustedUserCaKeys, "\n")), 0600); err != nil {
log.Fatal("Failed to create '%s': %v", fname, err)
}
@ -1030,7 +1029,7 @@ func loadInternalToken(sec *ini.Section) string {
}
defer fp.Close()
buf, err := ioutil.ReadAll(fp)
buf, err := io.ReadAll(fp)
if err != nil {
log.Fatal("Failed to read InternalTokenURI (%s): %v", uri, err)
}

3
modules/storage/local.go
View file

@ -7,7 +7,6 @@ package storage
import (
"context"
"io"
"io/ioutil"
"net/url"
"os"
"path/filepath"
@ -76,7 +75,7 @@ func (l *LocalStorage) Save(path string, r io.Reader, size int64) (int64, error)
if err := os.MkdirAll(l.tmpdir, os.ModePerm); err != nil {
return 0, err
}
tmp, err := ioutil.TempFile(l.tmpdir, "upload-*")
tmp, err := os.CreateTemp(l.tmpdir, "upload-*")
if err != nil {
return 0, err
}

4
modules/svg/discover_nobindata.go
View file

@ -8,7 +8,7 @@
package svg
import (
"io/ioutil"
"os"
"path/filepath"
"code.gitea.io/gitea/modules/setting"
@ -20,7 +20,7 @@ func Discover() map[string]string {
files, _ := filepath.Glob(filepath.Join(setting.StaticRootPath, "public", "img", "svg", "*.svg"))
for _, file := range files {
content, err := ioutil.ReadFile(file)
content, err := os.ReadFile(file)
if err == nil {
filename := filepath.Base(file)
svgs[filename[:len(filename)-4]] = string(content)

9
modules/templates/dynamic.go
View file

@ -9,7 +9,6 @@ package templates
import (
"html/template"
"io/ioutil"
"os"
"path"
"path/filepath"
@ -28,14 +27,14 @@ var (
// GetAsset returns asset content via name
func GetAsset(name string) ([]byte, error) {
bs, err := ioutil.ReadFile(filepath.Join(setting.CustomPath, name))
bs, err := os.ReadFile(filepath.Join(setting.CustomPath, name))
if err != nil && !os.IsNotExist(err) {
return nil, err
} else if err == nil {
return bs, nil
}
return ioutil.ReadFile(filepath.Join(setting.StaticRootPath, name))
return os.ReadFile(filepath.Join(setting.StaticRootPath, name))
}
// GetAssetNames returns assets list
@ -71,7 +70,7 @@ func Mailer() (*texttmpl.Template, *template.Template) {
continue
}
content, err := ioutil.ReadFile(path.Join(staticDir, filePath))
content, err := os.ReadFile(path.Join(staticDir, filePath))
if err != nil {
log.Warn("Failed to read static %s template. %v", filePath, err)
@ -100,7 +99,7 @@ func Mailer() (*texttmpl.Template, *template.Template) {
continue
}
content, err := ioutil.ReadFile(path.Join(customDir, filePath))
content, err := os.ReadFile(path.Join(customDir, filePath))
if err != nil {
log.Warn("Failed to read custom %s template. %v", filePath, err)

8
modules/templates/static.go
View file

@ -9,7 +9,7 @@ package templates
import (
"html/template"
"io/ioutil"
"io"
"os"
"path"
"path/filepath"
@ -28,7 +28,7 @@ var (
// GetAsset get a special asset, only for chi
func GetAsset(name string) ([]byte, error) {
bs, err := ioutil.ReadFile(filepath.Join(setting.CustomPath, name))
bs, err := os.ReadFile(filepath.Join(setting.CustomPath, name))
if err != nil && !os.IsNotExist(err) {
return nil, err
} else if err == nil {
@ -103,7 +103,7 @@ func Mailer() (*texttmpl.Template, *template.Template) {
continue
}
content, err := ioutil.ReadFile(path.Join(customDir, filePath))
content, err := os.ReadFile(path.Join(customDir, filePath))
if err != nil {
log.Warn("Failed to read custom %s template. %v", filePath, err)
@ -130,7 +130,7 @@ func Asset(name string) ([]byte, error) {
return nil, err
}
defer f.Close()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}
func AssetNames() []string {

4
routers/api/v1/misc/markdown_test.go
View file

@ -5,7 +5,7 @@
package misc
import (
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"net/url"
@ -172,7 +172,7 @@ func TestAPI_RenderRaw(t *testing.T) {
ctx := wrap(m)
for i := 0; i < len(simpleCases); i += 2 {
ctx.Req.Body = ioutil.NopCloser(strings.NewReader(simpleCases[i]))
ctx.Req.Body = io.NopCloser(strings.NewReader(simpleCases[i]))
MarkdownRaw(ctx)
assert.Equal(t, simpleCases[i+1], resp.Body.String())
resp.Body.Reset()

4
routers/private/restore_repo.go
View file

@ -5,7 +5,7 @@
package private
import (
"io/ioutil"
"io"
"net/http"
myCtx "code.gitea.io/gitea/modules/context"
@ -16,7 +16,7 @@ import (
// RestoreRepo restore a repository from data
func RestoreRepo(ctx *myCtx.PrivateContext) {
bs, err := ioutil.ReadAll(ctx.Req.Body)
bs, err := io.ReadAll(ctx.Req.Body)
if err != nil {
ctx.JSON(http.StatusInternalServerError, private.Response{
Err: err.Error(),

4
routers/web/repo/editor.go
View file

@ -6,7 +6,7 @@ package repo
import (
"fmt"
"io/ioutil"
"io"
"net/http"
"path"
"strings"
@ -127,7 +127,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
return
}
d, _ := ioutil.ReadAll(dataRc)
d, _ := io.ReadAll(dataRc)
if err := dataRc.Close(); err != nil {
log.Error("Error whilst closing blob data: %v", err)
}

3
routers/web/repo/http.go
View file

@ -10,7 +10,6 @@ import (
"compress/gzip"
gocontext "context"
"fmt"
"io/ioutil"
"net/http"
"os"
"os/exec"
@ -308,7 +307,7 @@ var (
func dummyInfoRefs(ctx *context.Context) {
infoRefsOnce.Do(func() {
tmpDir, err := ioutil.TempDir(os.TempDir(), "gitea-info-refs-cache")
tmpDir, err := os.MkdirTemp(os.TempDir(), "gitea-info-refs-cache")
if err != nil {
log.Error("Failed to create temp dir for git-receive-pack cache: %v", err)
return

4
routers/web/repo/issue.go
View file

@ -9,7 +9,7 @@ import (
"bytes"
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"path"
"strconv"
@ -707,7 +707,7 @@ func getFileContentFromDefaultBranch(ctx *context.Context, filename string) (str
return "", false
}
defer r.Close()
bytes, err = ioutil.ReadAll(r)
bytes, err = io.ReadAll(r)
if err != nil {
return "", false
}

3
routers/web/repo/lfs.go
View file

@ -9,7 +9,6 @@ import (
"fmt"
gotemplate "html/template"
"io"
"io/ioutil"
"net/http"
"path"
"strconv"
@ -300,7 +299,7 @@ func LFSFileGet(ctx *context.Context) {
buf := charset.ToUTF8WithFallbackReader(io.MultiReader(bytes.NewReader(buf), dataRc))
// Building code view blocks with line number on server side.
fileContent, _ := ioutil.ReadAll(buf)
fileContent, _ := io.ReadAll(buf)
var output bytes.Buffer
lines := strings.Split(string(fileContent), "\n")

6
routers/web/repo/setting.go
View file

@ -8,7 +8,7 @@ package repo
import (
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"strconv"
"strings"
@ -1126,9 +1126,9 @@ func UpdateAvatarSetting(ctx *context.Context, form forms.AvatarForm) error {
return errors.New(ctx.Tr("settings.uploaded_avatar_is_too_big"))
}
data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
if err != nil {
return fmt.Errorf("ioutil.ReadAll: %v", err)
return fmt.Errorf("io.ReadAll: %v", err)
}
st := typesniffer.DetectContentType(data)
if !(st.IsImage() && !st.IsSvgImage()) {

4
routers/web/repo/settings_test.go
View file

@ -5,8 +5,8 @@
package repo
import (
"io/ioutil"
"net/http"
"os"
"testing"
"code.gitea.io/gitea/models"
@ -22,7 +22,7 @@ import (
)
func createSSHAuthorizedKeysTmpPath(t *testing.T) func() {
tmpDir, err := ioutil.TempDir("", "tmp-ssh")
tmpDir, err := os.MkdirTemp("", "tmp-ssh")
if err != nil {
assert.Fail(t, "Unable to create temporary directory: %v", err)
return nil

9
routers/web/repo/view.go
View file

@ -11,7 +11,6 @@ import (
"fmt"
gotemplate "html/template"
"io"
"io/ioutil"
"net/http"
"net/url"
"path"
@ -344,7 +343,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
}, rd, &result)
if err != nil {
log.Error("Render failed: %v then fallback", err)
bs, _ := ioutil.ReadAll(rd)
bs, _ := io.ReadAll(rd)
ctx.Data["FileContent"] = strings.ReplaceAll(
gotemplate.HTMLEscapeString(string(bs)), "\n", `<br>`,
)
@ -353,7 +352,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
}
} else {
ctx.Data["IsRenderedHTML"] = true
buf, err = ioutil.ReadAll(rd)
buf, err = io.ReadAll(rd)
if err != nil {
log.Error("ReadAll failed: %v", err)
}
@ -528,13 +527,13 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
}
ctx.Data["FileContent"] = result.String()
} else if readmeExist {
buf, _ := ioutil.ReadAll(rd)
buf, _ := io.ReadAll(rd)
ctx.Data["IsRenderedHTML"] = true
ctx.Data["FileContent"] = strings.ReplaceAll(
gotemplate.HTMLEscapeString(string(buf)), "\n", `<br>`,
)
} else {
buf, _ := ioutil.ReadAll(rd)
buf, _ := io.ReadAll(rd)
lineNums := linesBytesCount(buf)
ctx.Data["NumLines"] = strconv.Itoa(lineNums)
ctx.Data["NumLinesSet"] = true

4
routers/web/repo/wiki.go
View file

@ -8,7 +8,7 @@ package repo
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"path/filepath"
@ -110,7 +110,7 @@ func wikiContentsByEntry(ctx *context.Context, entry *git.TreeEntry) []byte {
return nil
}
defer reader.Close()
content, err := ioutil.ReadAll(reader)
content, err := io.ReadAll(reader)
if err != nil {
ctx.ServerError("ReadAll", err)
return nil

4
routers/web/repo/wiki_test.go
View file

@ -5,7 +5,7 @@
package repo
import (
"io/ioutil"
"io"
"net/http"
"testing"
@ -47,7 +47,7 @@ func wikiContent(t *testing.T, repo *models.Repository, wikiName string) string
reader, err := entry.Blob().DataAsync()
assert.NoError(t, err)
defer reader.Close()
bytes, err := ioutil.ReadAll(reader)
bytes, err := io.ReadAll(reader)
assert.NoError(t, err)
return string(bytes)
}

3
routers/web/user/auth.go
View file

@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"
@ -704,7 +703,7 @@ func updateAvatarIfNeed(url string, u *models.User) {
}
// ignore any error
if err == nil && resp.StatusCode == http.StatusOK {
data, err := ioutil.ReadAll(io.LimitReader(resp.Body, setting.Avatar.MaxFileSize+1))
data, err := io.ReadAll(io.LimitReader(resp.Body, setting.Avatar.MaxFileSize+1))
if err == nil && int64(len(data)) <= setting.Avatar.MaxFileSize {
_ = u.UploadAvatar(data)
}

6
routers/web/user/setting/profile.go
View file

@ -8,7 +8,7 @@ package setting
import (
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"path/filepath"
@ -167,9 +167,9 @@ func UpdateAvatarSetting(ctx *context.Context, form *forms.AvatarForm, ctxUser *
return errors.New(ctx.Tr("settings.uploaded_avatar_is_too_big"))
}
data, err := ioutil.ReadAll(fr)
data, err := io.ReadAll(fr)
if err != nil {
return fmt.Errorf("ioutil.ReadAll: %v", err)
return fmt.Errorf("io.ReadAll: %v", err)
}
st := typesniffer.DetectContentType(data)

3
services/auth/source/oauth2/jwtsigningkey.go
View file

@ -15,7 +15,6 @@ import (
"encoding/base64"
"encoding/pem"
"fmt"
"io/ioutil"
"math/big"
"os"
"path/filepath"
@ -429,7 +428,7 @@ func loadOrCreateAsymmetricKey() (interface{}, error) {
}
}
bytes, err := ioutil.ReadFile(keyPath)
bytes, err := os.ReadFile(keyPath)
if err != nil {
return nil, err
}

5
services/gitdiff/gitdiff.go
View file

@ -13,7 +13,6 @@ import (
"html"
"html/template"
"io"
"io/ioutil"
"net/url"
"os"
"os/exec"
@ -721,7 +720,7 @@ parsingLoop:
// TODO: Handle skipping first n files
if len(diff.Files) >= maxFiles {
diff.IsIncomplete = true
_, err := io.Copy(ioutil.Discard, reader)
_, err := io.Copy(io.Discard, reader)
if err != nil {
// By the definition of io.Copy this never returns io.EOF
return diff, fmt.Errorf("Copy: %v", err)
@ -1280,7 +1279,7 @@ func GetDiffRangeWithWhitespaceBehavior(gitRepo *git.Repository, beforeCommitID,
indexFilename, deleteTemporaryFile, err := gitRepo.ReadTreeToTemporaryIndex(afterCommitID)
if err == nil {
defer deleteTemporaryFile()
workdir, err := ioutil.TempDir("", "empty-work-dir")
workdir, err := os.MkdirTemp("", "empty-work-dir")
if err != nil {
log.Error("Unable to create temporary directory: %v", err)
return nil, err

5
services/pull/check.go
View file

@ -8,7 +8,6 @@ package pull
import (
"context"
"fmt"
"io/ioutil"
"os"
"strconv"
"strings"
@ -75,7 +74,7 @@ func getMergeCommit(pr *models.PullRequest) (*git.Commit, error) {
}
}
indexTmpPath, err := ioutil.TempDir(os.TempDir(), "gitea-"+pr.BaseRepo.Name)
indexTmpPath, err := os.MkdirTemp(os.TempDir(), "gitea-"+pr.BaseRepo.Name)
if err != nil {
return nil, fmt.Errorf("Failed to create temp dir for repository %s: %v", pr.BaseRepo.RepoPath(), err)
}
@ -98,7 +97,7 @@ func getMergeCommit(pr *models.PullRequest) (*git.Commit, error) {
return nil, fmt.Errorf("git merge-base --is-ancestor: %v", err)
}
commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
commitIDBytes, err := os.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
if err != nil {
return nil, fmt.Errorf("ReadFile(%s): %v", headFile, err)
}

5
services/pull/merge.go
View file

@ -9,7 +9,6 @@ import (
"bufio"
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"regexp"
@ -149,7 +148,7 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge
}
sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")
if err := ioutil.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
if err := os.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
log.Error("Unable to write .git/info/sparse-checkout file in %s: %v", tmpBasePath, err)
return "", fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %v", err)
}
@ -276,7 +275,7 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge
}
for _, failingCommitPath := range failingCommitPaths {
if _, statErr := os.Stat(filepath.Join(failingCommitPath)); statErr == nil {
commitShaBytes, readErr := ioutil.ReadFile(filepath.Join(failingCommitPath))
commitShaBytes, readErr := os.ReadFile(filepath.Join(failingCommitPath))
if readErr != nil {
// Abandon this attempt to handle the error
log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

Some files were not shown because too many files have changed in this diff Show more