Replace use of io/ioutil with their alternatives

cloudfoundry · Aug 11, 2022 · 18621cd · 18621cd
1 parent ae07455
commit 18621cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/collectors/bosh_collector_test.go b/collectors/bosh_collector_test.go
@@ -2,7 +2,6 @@ package collectors_test
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -56,7 +55,7 @@ var _ = Describe("BoshCollector", func() {
 		environment = "test_environment"
 		boshName = "test_bosh_name"
 		boshUUID = "test_bosh_uuid"
-		tmpfile, err = ioutil.TempFile("", "service_discovery_collector_test_")
+		tmpfile, err = os.CreateTemp("", "service_discovery_collector_test_")
 		Expect(err).ToNot(HaveOccurred())
 		serviceDiscoveryFilename = tmpfile.Name()
 

diff --git a/collectors/service_discovery_collector.go b/collectors/service_discovery_collector.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"sync"
@@ -182,7 +181,7 @@ func (c *ServiceDiscoveryCollector) writeTargetGroupsToFile(targetGroups TargetG
 	}
 
 	dir, name := path.Split(c.serviceDiscoveryFilename)
-	f, err := ioutil.TempFile(dir, name)
+	f, err := os.CreateTemp(dir, name)
 	if err != nil {
 		return errors.New(fmt.Sprintf("Error creating temp file: %v", err))
 	}

diff --git a/collectors/service_discovery_collector_test.go b/collectors/service_discovery_collector_test.go
@@ -1,7 +1,6 @@
 package collectors_test
 
 import (
-	"io/ioutil"
 	"os"
 
 	. "github.com/benjamintf1/unmarshalledmatchers"
@@ -44,7 +43,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 		environment = "test_environment"
 		boshName = "test_bosh_name"
 		boshUUID = "test_bosh_uuid"
-		tmpfile, err = ioutil.TempFile("", "service_discovery_collector_test_")
+		tmpfile, err = os.CreateTemp("", "service_discovery_collector_test_")
 		Expect(err).ToNot(HaveOccurred())
 		serviceDiscoveryFilename = tmpfile.Name()
 		azsFilter = filters.NewAZsFilter([]string{})
@@ -209,7 +208,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 
 		It("writes a target groups file", func() {
 			Eventually(metrics).Should(Receive())
-			targetGroups, err := ioutil.ReadFile(serviceDiscoveryFilename)
+			targetGroups, err := os.ReadFile(serviceDiscoveryFilename)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(string(targetGroups)).To(MatchUnorderedJSON(targetGroupsContent))
 		})
@@ -228,7 +227,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 
 			It("writes an empty target groups file", func() {
 				Eventually(metrics).Should(Receive())
-				targetGroups, err := ioutil.ReadFile(serviceDiscoveryFilename)
+				targetGroups, err := os.ReadFile(serviceDiscoveryFilename)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(string(targetGroups)).To(Equal("[]"))
 			})
@@ -249,7 +248,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 
 			It("writes an empty target groups file", func() {
 				Eventually(metrics).Should(Receive())
-				targetGroups, err := ioutil.ReadFile(serviceDiscoveryFilename)
+				targetGroups, err := os.ReadFile(serviceDiscoveryFilename)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(string(targetGroups)).To(Equal("[]"))
 			})
@@ -270,7 +269,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 
 			It("writes an empty target groups file", func() {
 				Eventually(metrics).Should(Receive())
-				targetGroups, err := ioutil.ReadFile(serviceDiscoveryFilename)
+				targetGroups, err := os.ReadFile(serviceDiscoveryFilename)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(string(targetGroups)).To(Equal("[]"))
 			})
@@ -290,7 +289,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 
 			It("writes an empty target groups file", func() {
 				Eventually(metrics).Should(Receive())
-				targetGroups, err := ioutil.ReadFile(serviceDiscoveryFilename)
+				targetGroups, err := os.ReadFile(serviceDiscoveryFilename)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(string(targetGroups)).To(Equal("[]"))
 			})
@@ -311,7 +310,7 @@ var _ = Describe("ServiceDiscoveryCollector", func() {
 
 			It("writes an empty target groups file", func() {
 				Eventually(metrics).Should(Receive())
-				targetGroups, err := ioutil.ReadFile(serviceDiscoveryFilename)
+				targetGroups, err := os.ReadFile(serviceDiscoveryFilename)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(string(targetGroups)).To(Equal("[]"))
 			})