Merge pull request #161 from testwill/ioutil

chore: remove refs to deprecated io/ioutil
smallstep · Nov 30, 2023 · 898301b · 898301b
2 parents 67d1305 + 6754df6
commit 898301b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/examples/hello-mtls/go-grpc/client/client.go b/examples/hello-mtls/go-grpc/client/client.go
@@ -6,7 +6,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"sync"
@@ -55,7 +54,7 @@ func (r *rotator) loadCertificate(certFile, keyFile string) error {
 }
 
 func loadRootCertPool() (*x509.CertPool, error) {
-	root, err := ioutil.ReadFile(autocertRoot)
+	root, err := os.ReadFile(autocertRoot)
 	if err != nil {
 		return nil, err
 	}

diff --git a/examples/hello-mtls/go-grpc/server/server.go b/examples/hello-mtls/go-grpc/server/server.go
@@ -6,9 +6,9 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net"
+	"os"
 	"sync"
 	"time"
 
@@ -55,7 +55,7 @@ func (r *rotator) loadCertificate(certFile, keyFile string) error {
 }
 
 func loadRootCertPool() (*x509.CertPool, error) {
-	root, err := ioutil.ReadFile(autocertRoot)
+	root, err := os.ReadFile(autocertRoot)
 	if err != nil {
 		return nil, err
 	}

diff --git a/examples/hello-mtls/go/client/client.go b/examples/hello-mtls/go/client/client.go
@@ -5,7 +5,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -48,7 +48,7 @@ func (r *rotator) loadCertificate(certFile, keyFile string) error {
 }
 
 func loadRootCertPool() (*x509.CertPool, error) {
-	root, err := ioutil.ReadFile(autocertRoot)
+	root, err := os.ReadFile(autocertRoot)
 	if err != nil {
 		return nil, err
 	}
@@ -130,7 +130,7 @@ func main() {
 		}
 
 		defer r.Body.Close()
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			log.Fatal(err)
 		}

diff --git a/examples/hello-mtls/go/server/server.go b/examples/hello-mtls/go/server/server.go
@@ -5,8 +5,8 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
+	"os"
 	"net/http"
 	"sync"
 	"time"
@@ -48,7 +48,7 @@ func (r *rotator) loadCertificate(certFile, keyFile string) error {
 }
 
 func loadRootCertPool() (*x509.CertPool, error) {
-	root, err := ioutil.ReadFile(autocertRoot)
+	root, err := os.ReadFile(autocertRoot)
 	if err != nil {
 		return nil, err
 	}