Shore up HTTP client body closes, ioutil->io package

micromdm · May 2, 2023 · 3abd0dc · 3abd0dc
1 parent 07bc790
commit 3abd0dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cmd/nano2nano/main.go b/cmd/nano2nano/main.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	stdlog "log"
 	"net/http"
 
@@ -119,7 +119,7 @@ func httpPut(client *http.Client, url string, key string, sendBytes []byte) erro
 		return err
 	}
 	defer res.Body.Close()
-	_, err = ioutil.ReadAll(res.Body)
+	_, err = io.ReadAll(res.Body)
 	if err != nil {
 		return err
 	}

diff --git a/service/microwebhook/post.go b/service/microwebhook/post.go
@@ -27,6 +27,7 @@ func postWebhookEvent(
 	if err != nil {
 		return err
 	}
+	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
 		return fmt.Errorf("unexpected HTTP status %d %s", resp.StatusCode, resp.Status)
 	}

diff --git a/service/nanomdm/dm.go b/service/nanomdm/dm.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -51,11 +51,11 @@ func (c *DeclarativeManagementHTTPCaller) DeclarativeManagement(r *mdm.Request,
 	if err != nil {
 		return nil, err
 	}
-	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	defer resp.Body.Close()
+	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
 		return bodyBytes, service.NewHTTPStatusError(
 			resp.StatusCode,