Merge pull request jwilder#193 from testwill/ioutil

yariksheptykin · Jul 9, 2023 · f39443c · f39443c
2 parents 72405f0 + ce279ea
commit f39443c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/main.go b/main.go
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -144,12 +143,12 @@ func waitForDependencies() {
 						} else if err == nil && resp.StatusCode >= 200 && resp.StatusCode < 300 {
 							log.Printf("Received %d from %s\n", resp.StatusCode, u.String())
 							// dispose the response body and close it.
-							io.Copy(ioutil.Discard, resp.Body)
+							io.Copy(io.Discard, resp.Body)
 							resp.Body.Close()
 							return
 						} else {
 							log.Printf("Received %d from %s. Sleeping %s\n", resp.StatusCode, u.String(), waitRetryInterval)
-							io.Copy(ioutil.Discard, resp.Body)
+							io.Copy(io.Discard, resp.Body)
 							resp.Body.Close()
 							time.Sleep(waitRetryInterval)
 						}

diff --git a/template.go b/template.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net/url"
 	"os"
@@ -189,7 +188,7 @@ func generateDir(templateDir, destDir string) bool {
 		}
 	}
 
-	files, err := ioutil.ReadDir(templateDir)
+	files, err := os.ReadDir(templateDir)
 	if err != nil {
 		log.Fatalf("bad directory: %s, error: %s", templateDir, err)
 	}