ioutil -> io (deprecated)

Alexander Weber · pimterry · commit 3c5fe71c4c3b · 2023-06-05T16:56:59.000+02:00
(Cherry-picked from upstream)
diff --git a/src/targets/go/native.js b/src/targets/go/native.js
@@ -58,7 +58,7 @@ module.exports = function (source, options) {
     code.push(indent, '"net/http"')
 
     if (opts.printBody) {
-      code.push(indent, '"io/ioutil"')
+      code.push(indent, '"io"')
     }
 
     code.push(')')
@@ -126,7 +126,7 @@ module.exports = function (source, options) {
   if (opts.printBody) {
     code.blank()
       .push(indent, 'defer res.Body.Close()')
-      .push(indent, 'body, %s := ioutil.ReadAll(res.Body)', errorPlaceholder)
+      .push(indent, 'body, %s := io.ReadAll(res.Body)', errorPlaceholder)
     errorCheck()
   }
 
diff --git a/test/fixtures/output/go/native/application-form-encoded.go b/test/fixtures/output/go/native/application-form-encoded.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/application-json.go b/test/fixtures/output/go/native/application-json.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/cookies.go b/test/fixtures/output/go/native/cookies.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -17,7 +17,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/custom-method.go b/test/fixtures/output/go/native/custom-method.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -15,7 +15,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/full.go b/test/fixtures/output/go/native/full.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -22,7 +22,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/headers.go b/test/fixtures/output/go/native/headers.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -19,7 +19,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/https.go b/test/fixtures/output/go/native/https.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -15,7 +15,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/jsonObj-multiline.go b/test/fixtures/output/go/native/jsonObj-multiline.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/jsonObj-null-value.go b/test/fixtures/output/go/native/jsonObj-null-value.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/multipart-data.go b/test/fixtures/output/go/native/multipart-data.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/multipart-file.go b/test/fixtures/output/go/native/multipart-file.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/multipart-form-data.go b/test/fixtures/output/go/native/multipart-form-data.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/nested.go b/test/fixtures/output/go/native/nested.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -15,7 +15,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/query.go b/test/fixtures/output/go/native/query.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -15,7 +15,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/short.go b/test/fixtures/output/go/native/short.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -15,7 +15,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/fixtures/output/go/native/text-plain.go b/test/fixtures/output/go/native/text-plain.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"net/http"
-	"io/ioutil"
+	"io"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 	res, _ := http.DefaultClient.Do(req)
 
 	defer res.Body.Close()
-	body, _ := ioutil.ReadAll(res.Body)
+	body, _ := io.ReadAll(res.Body)
 
 	fmt.Println(res)
 	fmt.Println(string(body))
diff --git a/test/targets/go/native.js b/test/targets/go/native.js
@@ -9,7 +9,7 @@ module.exports = function (HTTPSnippet, fixtures) {
     })
 
     result.should.be.a.String()
-    result.should.eql('url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"\n\npayload := strings.NewReader("foo=bar")\n\nreq, _ := http.NewRequest("POST", url, payload)\n\nreq.Header.Add("cookie", "foo=bar; bar=baz")\nreq.Header.Add("accept", "application/json")\nreq.Header.Add("content-type", "application/x-www-form-urlencoded")\n\nres, _ := http.DefaultClient.Do(req)\n\ndefer res.Body.Close()\nbody, _ := ioutil.ReadAll(res.Body)\n\nfmt.Println(res)\nfmt.Println(string(body))')
+    result.should.eql('url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"\n\npayload := strings.NewReader("foo=bar")\n\nreq, _ := http.NewRequest("POST", url, payload)\n\nreq.Header.Add("cookie", "foo=bar; bar=baz")\nreq.Header.Add("accept", "application/json")\nreq.Header.Add("content-type", "application/x-www-form-urlencoded")\n\nres, _ := http.DefaultClient.Do(req)\n\ndefer res.Body.Close()\nbody, _ := io.ReadAll(res.Body)\n\nfmt.Println(res)\nfmt.Println(string(body))')
   })
 
   it('should support checkErrors option', function () {
@@ -24,7 +24,7 @@ import (
 \t"fmt"
 \t"strings"
 \t"net/http"
-\t"io/ioutil"
+\t"io"
 )
 
 func main() {
@@ -48,7 +48,7 @@ func main() {
 \t}
 
 \tdefer res.Body.Close()
-\tbody, err := ioutil.ReadAll(res.Body)
+\tbody, err := io.ReadAll(res.Body)
 \tif err != nil {
 \t\tpanic(err)
 \t}
@@ -105,7 +105,7 @@ import (
 \t"time"
 \t"strings"
 \t"net/http"
-\t"io/ioutil"
+\t"io"
 )
 
 func main() {
@@ -127,7 +127,7 @@ func main() {
 \tres, _ := client.Do(req)
 
 \tdefer res.Body.Close()
-\tbody, _ := ioutil.ReadAll(res.Body)
+\tbody, _ := io.ReadAll(res.Body)
 
 \tfmt.Println(res)
 \tfmt.Println(string(body))
@@ -148,7 +148,7 @@ import (
 \t"crypto/tls"
 \t"strings"
 \t"net/http"
-\t"io/ioutil"
+\t"io"
 )
 
 func main() {
@@ -172,7 +172,7 @@ func main() {
 \tres, _ := client.Do(req)
 
 \tdefer res.Body.Close()
-\tbody, _ := ioutil.ReadAll(res.Body)
+\tbody, _ := io.ReadAll(res.Body)
 
 \tfmt.Println(res)
 \tfmt.Println(string(body))

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ module.exports = function (source, options) {`
`58`	`58`	`code.push(indent, '"net/http"')`
`59`	`59`
`60`	`60`	`if (opts.printBody) {`
`61`		`- code.push(indent, '"io/ioutil"')`
	`61`	`+ code.push(indent, '"io"')`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`code.push(')')`
`@@ -126,7 +126,7 @@ module.exports = function (source, options) {`
`126`	`126`	`if (opts.printBody) {`
`127`	`127`	`code.blank()`
`128`	`128`	`.push(indent, 'defer res.Body.Close()')`
`129`		`- .push(indent, 'body, %s := ioutil.ReadAll(res.Body)', errorPlaceholder)`
	`129`	`+ .push(indent, 'body, %s := io.ReadAll(res.Body)', errorPlaceholder)`
`130`	`130`	`errorCheck()`
`131`	`131`	`}`
`132`	`132`