From dfc655acf763b8779f5785a2b70c0df1df124331 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@hashicorp.com>
Date: Thu, 24 Jun 2021 11:59:46 -0400
Subject: [PATCH] Merge pull request #10473 from knusbaum/ioutil

{api,command/agent}: change io.Discard to ioutil.Discard
---
 api/api.go             | 2 +-
 command/agent/agent.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/api.go b/api/api.go
index 4b01b3bfcf..a35980a9a1 100644
--- a/api/api.go
+++ b/api/api.go
@@ -1069,7 +1069,7 @@ func requireOK(d time.Duration, resp *http.Response, e error) (time.Duration, *h
 // is necessary to ensure that the http.Client's underlying RoundTripper is able
 // to re-use the TCP connection. See godoc on net/http.Client.Do.
 func closeResponseBody(resp *http.Response) error {
-	_, _ = io.Copy(io.Discard, resp.Body)
+	_, _ = io.Copy(ioutil.Discard, resp.Body)
 	return resp.Body.Close()
 }
 
diff --git a/command/agent/agent.go b/command/agent/agent.go
index a0a3601c64..fade33e6bc 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -182,7 +182,7 @@ func (c *cmd) run(args []string) int {
 	if config.Logging.LogJSON {
 		// Hide all non-error output when JSON logging is enabled.
 		ui.Ui = &cli.BasicUI{
-			BasicUi: mcli.BasicUi{ErrorWriter: c.ui.Stderr(), Writer: io.Discard},
+			BasicUi: mcli.BasicUi{ErrorWriter: c.ui.Stderr(), Writer: ioutil.Discard},
 		}
 	}