client: move from io/ioutil to io and os packages

Signed-off-by: Eng Zer Jun <[email protected]>
canonical · Oct 2, 2022 · 6b101e5 · 6b101e5
1 parent a0ed441
commit 6b101e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/client/lxd_images.go b/client/lxd_images.go
@@ -4,7 +4,6 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime"
 	"mime/multipart"
 	"net/http"
@@ -417,7 +416,7 @@ func (r *ProtocolLXD) CreateImage(image api.ImagesPost, args *ImageCreateArgs) (
 		contentType = "application/octet-stream"
 	} else {
 		// If split image, we need mime encoding
-		tmpfile, err := ioutil.TempFile("", "lxc_image_")
+		tmpfile, err := os.CreateTemp("", "lxc_image_")
 		if err != nil {
 			return nil, err
 		}
@@ -762,14 +761,14 @@ func (r *ProtocolLXD) CopyImage(source ImageServer, image api.Image, args *Image
 
 	// Relay mode
 	if args != nil && args.Mode == "relay" {
-		metaFile, err := ioutil.TempFile("", "lxc_image_")
+		metaFile, err := os.CreateTemp("", "lxc_image_")
 		if err != nil {
 			return nil, err
 		}
 
 		defer func() { _ = os.Remove(metaFile.Name()) }()
 
-		rootfsFile, err := ioutil.TempFile("", "lxc_image_")
+		rootfsFile, err := os.CreateTemp("", "lxc_image_")
 		if err != nil {
 			return nil, err
 		}

diff --git a/client/lxd_server.go b/client/lxd_server.go
@@ -2,7 +2,7 @@ package lxd
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/gorilla/websocket"
@@ -184,7 +184,7 @@ func (r *ProtocolLXD) GetMetrics() (string, error) {
 	}
 
 	// Get the content.
-	content, err := ioutil.ReadAll(resp.Body)
+	content, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", err
 	}

diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go
@@ -5,7 +5,6 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -156,7 +155,7 @@ func (r *ProtocolSimpleStreams) GetImageFile(fingerprint string, req ImageFileRe
 				}
 
 				// Create temporary file for the delta
-				deltaFile, err := ioutil.TempFile("", "lxc_image_")
+				deltaFile, err := os.CreateTemp("", "lxc_image_")
 				if err != nil {
 					return nil, err
 				}
@@ -172,7 +171,7 @@ func (r *ProtocolSimpleStreams) GetImageFile(fingerprint string, req ImageFileRe
 				}
 
 				// Create temporary file for the delta
-				patchedFile, err := ioutil.TempFile("", "lxc_image_")
+				patchedFile, err := os.CreateTemp("", "lxc_image_")
 				if err != nil {
 					return nil, err
 				}