Merge pull request #231 from tristanmorgan/no-ioutil

Remove deprecated ioutil.
hashicorp · Oct 30, 2023 · 0309b96 · 0309b96
2 parents ede9cf9 + f8f2b8d
commit 0309b96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/config.go b/config.go
@@ -6,7 +6,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"reflect"
 	"strings"
@@ -245,7 +244,7 @@ var configDecodeHook = mapstructure.ComposeDecodeHookFunc(
 // configuration struct
 func DecodeConfig(r io.Reader) (*HumanConfig, error) {
 	// Parse the file (could be HCL or JSON)
-	bytes, err := ioutil.ReadAll(r)
+	bytes, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}

diff --git a/main_test.go b/main_test.go
@@ -5,8 +5,8 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
+	"io"
 	"os"
 	"reflect"
 	"strings"
@@ -18,7 +18,7 @@ import (
 )
 
 // Change as needed to see log/consul-agent output
-var output = ioutil.Discard
+var output = io.Discard
 var LOGOUT = output
 var STDOUT = output
 var STDERR = output