Skip to content

Commit

Permalink
fix integration test suite
Browse files Browse the repository at this point in the history 
and remove usage of deprecated ioutil package

Signed-off-by: Taylor Silva <[email protected]>
  • Loading branch information
@taylorsilva
taylorsilva committed Jun 8, 2024
1 parent d2d09a4 commit 9b6040a
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 98 deletions.
3 changes: 1 addition & 2 deletions check/check_suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package check_test

import (
"io/ioutil"
"os"
"path/filepath"
"testing"
Expand Down Expand Up @@ -37,7 +36,7 @@ func TestCheck(t *testing.T) {

func Fixture(filename string) string {
path := filepath.Join("fixtures", filename)
contents, err := ioutil.ReadFile(path)
contents, err := os.ReadFile(path)
if err != nil {
panic(err)
}
Expand Down
3 changes: 1 addition & 2 deletions check/command_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package check_test

import (
"io/ioutil"
"os"

. "github.com/onsi/ginkgo"
Expand All @@ -25,7 +24,7 @@ var _ = Describe("Check Command", func() {

BeforeEach(func() {
var err error
tmpPath, err = ioutil.TempDir("", "check_command")
tmpPath, err = os.MkdirTemp("", "check_command")
Ω(err).ShouldNot(HaveOccurred())

request = Request{
Expand Down
11 changes: 5 additions & 6 deletions in/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ import (
"encoding/base64"
"errors"
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"strconv"

"github.com/concourse/s3-resource"
s3resource "github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/versions"
)

Expand Down Expand Up @@ -179,11 +178,11 @@ func (command *Command) Run(destinationDir string, request Request) (Response, e
}

func (command *Command) writeURLFile(destDir string, url string) error {
return ioutil.WriteFile(filepath.Join(destDir, "url"), []byte(url), 0644)
return os.WriteFile(filepath.Join(destDir, "url"), []byte(url), 0644)
}

func (command *Command) writeVersionFile(versionNumber string, destDir string) error {
return ioutil.WriteFile(filepath.Join(destDir, "version"), []byte(versionNumber), 0644)
return os.WriteFile(filepath.Join(destDir, "version"), []byte(versionNumber), 0644)
}

func (command *Command) downloadFile(bucketName string, remotePath string, versionID string, destinationDir string, destinationFile string) error {
Expand All @@ -209,7 +208,7 @@ func (command *Command) downloadTags(bucketName string, remotePath string, versi
}

func (command *Command) createInitialFile(destDir string, destFile string, data []byte) error {
return ioutil.WriteFile(filepath.Join(destDir, destFile), []byte(data), 0644)
return os.WriteFile(filepath.Join(destDir, destFile), []byte(data), 0644)
}

func (command *Command) metadata(remotePath string, private bool, url string) []s3resource.MetadataPair {
Expand Down Expand Up @@ -241,7 +240,7 @@ func extractArchive(mime, filename string) error {
}

if mime == "application/gzip" || mime == "application/x-gzip" {
fileInfos, err := ioutil.ReadDir(destDir)
fileInfos, err := os.ReadDir(destDir)
if err != nil {
return fmt.Errorf("failed to read dir: %s", err)
}
Expand Down
45 changes: 22 additions & 23 deletions in/command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"archive/zip"
"compress/gzip"
"io"
"io/ioutil"
"log"
"os"
"path"
Expand All @@ -15,7 +14,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/concourse/s3-resource"
s3resource "github.com/concourse/s3-resource"
. "github.com/concourse/s3-resource/in"

"github.com/concourse/s3-resource/fakes"
Expand All @@ -34,7 +33,7 @@ var _ = Describe("In Command", func() {

BeforeEach(func() {
var err error
tmpPath, err = ioutil.TempDir("", "in_command")
tmpPath, err = os.MkdirTemp("", "in_command")
Ω(err).ShouldNot(HaveOccurred())

destDir = filepath.Join(tmpPath, "destination")
Expand Down Expand Up @@ -154,7 +153,7 @@ var _ = Describe("In Command", func() {
Ω(err).ShouldNot(HaveOccurred())

Ω(urlPath).Should(ExistOnFilesystem())
contents, err := ioutil.ReadFile(urlPath)
contents, err := os.ReadFile(urlPath)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("http://google.com"))

Expand All @@ -178,7 +177,7 @@ var _ = Describe("In Command", func() {
Ω(err).ShouldNot(HaveOccurred())

Ω(urlPath).Should(ExistOnFilesystem())
contents, err := ioutil.ReadFile(urlPath)
contents, err := os.ReadFile(urlPath)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("http://google.com"))

Expand All @@ -199,7 +198,7 @@ var _ = Describe("In Command", func() {
Ω(err).ShouldNot(HaveOccurred())

Ω(versionFile).Should(ExistOnFilesystem())
contents, err := ioutil.ReadFile(versionFile)
contents, err := os.ReadFile(versionFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("1.3"))
})
Expand Down Expand Up @@ -262,7 +261,7 @@ var _ = Describe("In Command", func() {
s3client.DownloadFileStub = func(bucketName string, remotePath string, versionID string, localPath string) error {
src := filepath.Join(tmpPath, "some-file")

err := ioutil.WriteFile(src, []byte("some-contents"), os.ModePerm)
err := os.WriteFile(src, []byte("some-contents"), os.ModePerm)
Expect(err).NotTo(HaveOccurred())

err = createTarball([]string{src}, tmpPath, localPath)
Expand All @@ -279,7 +278,7 @@ var _ = Describe("In Command", func() {
_, err := command.Run(destDir, request)
Expect(err).NotTo(HaveOccurred())

bs, err := ioutil.ReadFile(filepath.Join(destDir, "some-file"))
bs, err := os.ReadFile(filepath.Join(destDir, "some-file"))
Expect(err).NotTo(HaveOccurred())

Expect(bs).To(Equal([]byte("some-contents")))
Expand All @@ -289,10 +288,10 @@ var _ = Describe("In Command", func() {
Context("when the file is a zip", func() {
BeforeEach(func() {
s3client.DownloadFileStub = func(bucketName string, remotePath string, versionID string, localPath string) error {
inDir, err := ioutil.TempDir(tmpPath, "zip-dir")
inDir, err := os.MkdirTemp(tmpPath, "zip-dir")
Expect(err).NotTo(HaveOccurred())

err = ioutil.WriteFile(path.Join(inDir, "some-file"), []byte("some-contents"), os.ModePerm)
err = os.WriteFile(path.Join(inDir, "some-file"), []byte("some-contents"), os.ModePerm)
Expect(err).NotTo(HaveOccurred())

err = zipit(path.Join(inDir, "/"), localPath, "")
Expand All @@ -306,7 +305,7 @@ var _ = Describe("In Command", func() {
_, err := command.Run(destDir, request)
Expect(err).NotTo(HaveOccurred())

bs, err := ioutil.ReadFile(filepath.Join(destDir, "some-file"))
bs, err := os.ReadFile(filepath.Join(destDir, "some-file"))
Expect(err).NotTo(HaveOccurred())

Expect(bs).To(Equal([]byte("some-contents")))
Expand Down Expand Up @@ -338,7 +337,7 @@ var _ = Describe("In Command", func() {
_, err := command.Run(destDir, request)
Expect(err).NotTo(HaveOccurred())

bs, err := ioutil.ReadFile(filepath.Join(destDir, "a-file-1.3"))
bs, err := os.ReadFile(filepath.Join(destDir, "a-file-1.3"))
Expect(err).NotTo(HaveOccurred())

Expect(string(bs)).To(Equal("some-contents"))
Expand All @@ -356,12 +355,12 @@ var _ = Describe("In Command", func() {

someFile1 := filepath.Join(tmpPath, "some-dir", "some-file")

err = ioutil.WriteFile(someFile1, []byte("some-contents"), os.ModePerm)
err = os.WriteFile(someFile1, []byte("some-contents"), os.ModePerm)
Expect(err).NotTo(HaveOccurred())

someFile2 := filepath.Join(tmpPath, "some-file")

err = ioutil.WriteFile(someFile2, []byte("some-other-contents"), os.ModePerm)
err = os.WriteFile(someFile2, []byte("some-other-contents"), os.ModePerm)
Expect(err).NotTo(HaveOccurred())

tarPath := filepath.Join(tmpPath, "some-tar")
Expand Down Expand Up @@ -395,11 +394,11 @@ var _ = Describe("In Command", func() {

Expect(filepath.Join(destDir, "some-dir", "some-file")).To(BeARegularFile())

bs, err := ioutil.ReadFile(filepath.Join(destDir, "some-dir", "some-file"))
bs, err := os.ReadFile(filepath.Join(destDir, "some-dir", "some-file"))
Expect(err).NotTo(HaveOccurred())
Expect(bs).To(Equal([]byte("some-contents")))

bs, err = ioutil.ReadFile(filepath.Join(destDir, "some-file"))
bs, err = os.ReadFile(filepath.Join(destDir, "some-file"))
Expect(err).NotTo(HaveOccurred())
Expect(bs).To(Equal([]byte("some-other-contents")))
})
Expand All @@ -408,7 +407,7 @@ var _ = Describe("In Command", func() {
Context("when the file is not an archive", func() {
BeforeEach(func() {
s3client.DownloadFileStub = func(bucketName string, remotePath string, versionID string, localPath string) error {
err := ioutil.WriteFile(localPath, []byte("some-contents"), os.ModePerm)
err := os.WriteFile(localPath, []byte("some-contents"), os.ModePerm)
Expect(err).NotTo(HaveOccurred())

return nil
Expand Down Expand Up @@ -438,7 +437,7 @@ var _ = Describe("In Command", func() {

contentFile := filepath.Join(destDir, initialFilename)
Ω(contentFile).Should(BeARegularFile())
contents, err := ioutil.ReadFile(contentFile)
contents, err := os.ReadFile(contentFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
})
Expand All @@ -454,7 +453,7 @@ var _ = Describe("In Command", func() {

contentFile := filepath.Join(destDir, initialFilename)
Ω(contentFile).Should(BeARegularFile())
contents, err := ioutil.ReadFile(contentFile)
contents, err := os.ReadFile(contentFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("the hard questions are hard 🙈"))
})
Expand Down Expand Up @@ -496,7 +495,7 @@ var _ = Describe("In Command", func() {

contentFile := filepath.Join(destDir, initialFilename)
Ω(contentFile).Should(BeARegularFile())
contents, err := ioutil.ReadFile(contentFile)
contents, err := os.ReadFile(contentFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
})
Expand All @@ -519,7 +518,7 @@ var _ = Describe("In Command", func() {

contentFile := filepath.Join(destDir, filename)
Ω(contentFile).Should(BeARegularFile())
contents, err := ioutil.ReadFile(contentFile)
contents, err := os.ReadFile(contentFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
})
Expand All @@ -535,7 +534,7 @@ var _ = Describe("In Command", func() {

contentFile := filepath.Join(destDir, filename)
Ω(contentFile).Should(BeARegularFile())
contents, err := ioutil.ReadFile(contentFile)
contents, err := os.ReadFile(contentFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("the hard questions are hard 🙈"))
})
Expand Down Expand Up @@ -577,7 +576,7 @@ var _ = Describe("In Command", func() {

contentFile := filepath.Join(destDir, filename)
Ω(contentFile).Should(BeARegularFile())
contents, err := ioutil.ReadFile(contentFile)
contents, err := os.ReadFile(contentFile)
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
})
Expand Down
25 changes: 12 additions & 13 deletions integration/check_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ package integration_test
import (
"bytes"
"encoding/json"
"io/ioutil"
"os"
"os/exec"
"path/filepath"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/concourse/s3-resource"
s3resource "github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/check"
"github.com/onsi/gomega/gbytes"
"github.com/onsi/gomega/gexec"
Expand Down Expand Up @@ -101,7 +100,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -135,7 +134,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -199,7 +198,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -228,7 +227,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -268,7 +267,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -341,7 +340,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -376,7 +375,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -430,7 +429,7 @@ var _ = Describe("check", func() {
err := json.NewEncoder(stdin).Encode(checkRequest)
Ω(err).ShouldNot(HaveOccurred())

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -500,7 +499,7 @@ var _ = Describe("check", func() {
BeforeEach(func() {
directoryPrefix = "files-in-bucket-that-do-not-match-with-version"

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -546,7 +545,7 @@ var _ = Describe("check", func() {
BeforeEach(func() {
directoryPrefix = "files-in-bucket-that-do-match-with-version"

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down Expand Up @@ -609,7 +608,7 @@ var _ = Describe("check", func() {
BeforeEach(func() {
directoryPrefix = "files-in-bucket-with-latest-version-deleted"

tempFile, err := ioutil.TempFile("", "file-to-upload")
tempFile, err := os.CreateTemp("", "file-to-upload")
Ω(err).ShouldNot(HaveOccurred())
tempFile.Close()

Expand Down
Loading

0 comments on commit 9b6040a

Please sign in to comment.