remove deprecated ioutil

Author: burmudar

cmd/docsite/serve.go

@@ -3,10 +3,10 @@ package main
 import (
 	"crypto/tls"
 	"flag"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
+	"os"
 	"sync"
 )
 
@@ -49,11 +49,11 @@ func init() {
 		}
 		if *tlsCertPath != "" || *tlsKeyPath != "" {
 			log.Printf("# TLS listener enabled")
-			tlsCert, err := ioutil.ReadFile(*tlsCertPath)
+			tlsCert, err := os.ReadFile(*tlsCertPath)
 			if err != nil {
 				return err
 			}
-			tlsKey, err := ioutil.ReadFile(*tlsKeyPath)
+			tlsKey, err := os.ReadFile(*tlsKeyPath)
 			if err != nil {
 				return err
 			}

cmd/docsite/site.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -36,7 +36,7 @@ func siteFromFlags() (*docsite.Site, *docsiteConfig, error) {
 
 	paths := filepath.SplitList(*configPath)
 	for _, path := range paths {
-		data, err := ioutil.ReadFile(path)
+		data, err := os.ReadFile(path)
 		if os.IsNotExist(err) {
 			continue
 		} else if err != nil {
@@ -324,7 +324,7 @@ func (fs *versionedFileSystemURL) fetchAndCacheVersion(version string) (http.Fil
 	if strings.Contains(urlStr, "$VERSION") && strings.Contains(urlStr, "github") && !strings.Contains(urlStr, "refs/heads/$VERSION") {
 		return nil, fmt.Errorf("refusing to use insecure docsite configuration for multi-version-aware GitHub URLs: the URL pattern %q must include \"refs/heads/$VERSION\", not just \"$VERSION\" (see docsite README.md for more information)", urlStr)
 	}
-	urlStr = strings.Replace(fs.url, "$VERSION", version, -1)
+	urlStr = strings.ReplaceAll(fs.url, "$VERSION", version)
 
 	// HACK: Workaround for https://github.com/sourcegraph/sourcegraph-public-snapshot/issues/3030. This assumes
 	// that tags all begin with "vN" where N is some number.
@@ -363,7 +363,7 @@ func zipFileSystemAtURL(url, dir string) (http.FileSystem, error) {
 	} else if resp.StatusCode != http.StatusOK {
 		return nil, &os.PathError{Op: "Get", Path: url, Err: fmt.Errorf("HTTP response status code %d", resp.StatusCode)}
 	}
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -397,7 +397,7 @@ func mapFromZipArchive(z *zip.Reader, dir string) (map[string]string, error) {
 		if err != nil {
 			return nil, errors.WithMessagef(err, "open %q", zf.Name)
 		}
-		data, err := ioutil.ReadAll(f)
+		data, err := io.ReadAll(f)
 		f.Close()
 		if err != nil {
 			return nil, errors.WithMessagef(err, "read %q", zf.Name)

template.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"fmt"
 	"html/template"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -42,7 +42,7 @@ func (s *Site) getTemplate(templatesFS http.FileSystem, name string, extraFuncs
 			return nil, err
 		}
 		defer f.Close()
-		data, err := ioutil.ReadAll(f)
+		data, err := io.ReadAll(f)
 		if err != nil {
 			return nil, err
 		}

util.go

@@ -1,7 +1,7 @@
 package docsite
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -11,5 +11,5 @@ func ReadFile(fs http.FileSystem, path string) ([]byte, error) {
 		return nil, err
 	}
 	defer f.Close()
-	return ioutil.ReadAll(f)
+	return io.ReadAll(f)
 }