Don't throw error for license embed folder

- Removed tests that are no longer applicable because we refactored to find windowsfs-release directly

Co-authored-by: Michael Oleske <[email protected]>
Co-authored-by: Nancy Hsieh <[email protected]>

[#174372968] The `hydrate-windows2016fs-release` fails due to "there is more than one file system embedded in the tile"

winfsinjector/application.go

@@ -17,7 +17,6 @@ import (
 var (
  readFile = ioutil.ReadFile
  removeAll = os.RemoveAll
- readDir = ioutil.ReadDir
 )
 
 type Application struct {
@@ -70,28 +69,10 @@ func (a Application) Run(inputTile, outputTile, registry, workingDir string) err
  return err
  }
 
- // find what the embedded directory is
- embedDirectory := filepath.Join(extractedTileDir, "embed")
- files, err := readDir(embedDirectory)
- if _, err := os.Stat(embedDirectory); os.IsNotExist(err) {
- return errors.New("there is no file system embedded in the tile; please contact the tile authors to fix")
+ embeddedReleaseDir := filepath.Join(extractedTileDir, "embed/windowsfs-release")
+ if _, err := os.Stat(embeddedReleaseDir); os.IsNotExist(err) {
+ return errors.New("the 'windowsfs-release' file system is not embedded in the tile; please contact the tile authors to fix")
  }
-
- if len(files) > 1 {
- return errors.New("there is more than one file system embedded in the tile; please contact the tile authors to fix")
- }
-
- if len(files) == 0 {
- fmt.Println("The file system has already been injected in the tile; skipping injection")
- return nil
- }
-
- e := files[0]
- if !e.IsDir() {
- return errors.New("the embedded file system is not a directory; please contact the tile authors to fix")
- }
-
- embeddedReleaseDir := filepath.Join(embedDirectory, e.Name())
  releaseVersion, err := a.extractReleaseVersion(embeddedReleaseDir)
  if err != nil {
  return err

winfsinjector/application_test.go

@@ -3,20 +3,20 @@ package winfsinjector_test
 import (
  "errors"
  "fmt"
+ "io/ioutil"
+ "os"
+ "path/filepath"
+
  . "github.com/onsi/ginkgo"
  . "github.com/onsi/gomega"
  "github.com/pivotal-cf/winfs-injector/winfsinjector"
  "github.com/pivotal-cf/winfs-injector/winfsinjector/fakes"
- "io/ioutil"
- "os"
- "path/filepath"
 )
 
 var _ = Describe("application", func() {
  Describe("Run", func() {
  var (
  fakeReleaseCreator *fakes.ReleaseCreator
- fakeEmbeddedDirectory *fakes.FileInfo
  fakeInjector *fakes.Injector
  fakeZipper *fakes.Zipper
 
@@ -39,7 +39,7 @@ var _ = Describe("application", func() {
  outputTile = "/path/to/output/tile"
  registry = "/path/to/docker/registry"
 
- workingDir, err = ioutil.TempDir("","")
+ workingDir, err = ioutil.TempDir("", "")
  Expect(err).ToNot(HaveOccurred())
 
  embedFilePath := fmt.Sprintf("%s/extracted-tile/embed", workingDir)
@@ -66,23 +66,15 @@ windows2019fs/windows2016fs-2019.0.43.tgz:
  }
  })
 
- fakeEmbeddedDirectory = new(fakes.FileInfo)
- fakeEmbeddedDirectory.IsDirReturns(true)
- fakeEmbeddedDirectory.NameReturns("windowsfs-release")
-
- winfsinjector.SetReadDir(func(string) ([]os.FileInfo, error) {
- return []os.FileInfo{
- fakeEmbeddedDirectory,
- }, nil
- })
+ err = os.MkdirAll(embedFilePath+"/windowsfs-release", os.ModePerm)
+ Expect(err).ToNot(HaveOccurred())
 
  app = winfsinjector.NewApplication(fakeReleaseCreator, fakeInjector, fakeZipper)
  })
 
  AfterEach(func() {
  winfsinjector.ResetReadFile()
  winfsinjector.ResetRemoveAll()
- winfsinjector.ResetReadDir()
  })
 
  It("unzips the tile", func() {
@@ -93,7 +85,7 @@ windows2019fs/windows2016fs-2019.0.43.tgz:
 
  inputTile, extractedTileDir := fakeZipper.UnzipArgsForCall(0)
  Expect(inputTile).To(Equal(filepath.Join("/", "path", "to", "input", "tile")))
- Expect(extractedTileDir).To(Equal(fmt.Sprintf("%s%s", workingDir,filepath.Join("/", "extracted-tile"))))
+ Expect(extractedTileDir).To(Equal(fmt.Sprintf("%s%s", workingDir, filepath.Join("/", "extracted-tile"))))
  })
 
  It("creates the release", func() {
@@ -143,7 +135,7 @@ windows2019fs/windows2016fs-2019.0.43.tgz:
  Expect(err).NotTo(HaveOccurred())
 
  Expect(removeAllCallCount).To(Equal(1))
- Expect(removeAllPath).To(Equal(fmt.Sprintf("%s%s", workingDir,filepath.Join("/", "extracted-tile", "embed", "windowsfs-release"))))
+ Expect(removeAllPath).To(Equal(fmt.Sprintf("%s%s", workingDir, filepath.Join("/", "extracted-tile", "embed", "windowsfs-release"))))
  })
 
  It("zips up the injected tile dir", func() {
@@ -212,73 +204,42 @@ windows2019fs/windows2016fs-MISSING-IMAGE-TAG.tgz:
  })
  })
 
- Context("when the embed directory is not a directory", func() {
+ Context("when there is multiple directories embedded in the tile", func() {
  BeforeEach(func() {
- fakeEmbeddedDirectory = new(fakes.FileInfo)
- fakeEmbeddedDirectory.IsDirReturns(false)
- fakeEmbeddedDirectory.NameReturns("not a directory")
+ embedFilePath := fmt.Sprintf("%s/extracted-tile/embed", workingDir)
+ err = os.MkdirAll(embedFilePath+"/this-is-another-folder", os.ModePerm)
+ Expect(err).ToNot(HaveOccurred())
  })
 
- It("returns the error", func() {
+ It("creates a release with the windowsfs-release", func() {
  err := app.Run(inputTile, outputTile, registry, workingDir)
- Expect(err).To(HaveOccurred())
- Expect(err).To(MatchError("the embedded file system is not a directory; please contact the tile authors to fix"))
- })
- })
+ Expect(err).ToNot(HaveOccurred())
 
- Context("when more than one file system is embedded in the tile", func() {
- BeforeEach(func() {
- winfsinjector.SetReadDir(func(string) ([]os.FileInfo, error) {
- return []os.FileInfo{
- fakeEmbeddedDirectory,
- fakeEmbeddedDirectory,
- }, nil
- })
- })
+ Expect(fakeReleaseCreator.CreateReleaseCallCount()).To(Equal(1))
 
- It("returns the error", func() {
- err := app.Run(inputTile, outputTile, registry, workingDir)
- Expect(err).To(HaveOccurred())
- Expect(err).To(MatchError("there is more than one file system embedded in the tile; please contact the tile authors to fix"))
+ releaseName, imageName, releaseDir, tarballPath, imageTag, registry, version := fakeReleaseCreator.CreateReleaseArgsForCall(0)
+ Expect(releaseName).To(Equal("windows2019fs"))
+ Expect(imageName).To(Equal("cloudfoundry/windows2016fs"))
+ Expect(releaseDir).To(Equal(fmt.Sprintf("%s/extracted-tile/embed/windowsfs-release", workingDir)))
+ Expect(tarballPath).To(Equal(fmt.Sprintf("%s/extracted-tile/releases/windows2019fs-9.3.6.tgz", workingDir)))
+ Expect(imageTag).To(Equal("2019.0.43"))
+ Expect(registry).To(Equal("/path/to/docker/registry"))
+ Expect(version).To(Equal("9.3.6"))
  })
  })
 
- Context("when there are no file systems embedded in the tile", func() {
+ Context("when windowsfs-release is not embedded in the tile", func() {
  BeforeEach(func() {
- workingDir = "not/a/path/to/tile"
- winfsinjector.SetReadDir(func(string) ([]os.FileInfo, error) {
-  return []os.FileInfo{}, nil
- })
+ embedFilePath := fmt.Sprintf("%s/extracted-tile/embed", workingDir)
+ os.RemoveAll(embedFilePath + "/windowsfs-release")
+ err = os.MkdirAll(embedFilePath+"/this-is-another-folder", os.ModePerm)
+ Expect(err).ToNot(HaveOccurred())
  })
 
  It("returns the error", func() {
  err := app.Run(inputTile, outputTile, registry, workingDir)
  Expect(err).To(HaveOccurred())
- Expect(err).To(MatchError("there is no file system embedded in the tile; please contact the tile authors to fix"))
- })
- })
-
- Context("when the file system has already been injected", func() {
- BeforeEach(func() {
- winfsinjector.SetReadDir(func(string) ([]os.FileInfo, error) {
- return []os.FileInfo{}, nil
- })
- })
-
- It("does not return an error and exits", func() {
- var err error
- r, w, _ := os.Pipe()
- tmp := os.Stdout
- defer func() {
- os.Stdout = tmp
- }()
- os.Stdout = w
- err = app.Run(inputTile, outputTile, registry, workingDir)
- w.Close()
-
- Expect(err).ToNot(HaveOccurred())
- stdout, _ := ioutil.ReadAll(r)
- Expect(string(stdout)).To(ContainSubstring("The file system has already been injected in the tile; skipping injection"))
+ Expect(err).To(MatchError("the 'windowsfs-release' file system is not embedded in the tile; please contact the tile authors to fix"))
  })
  })
 

winfsinjector/exports_test.go

@@ -20,11 +20,3 @@ func SetRemoveAll(f func(string) error) {
 func ResetRemoveAll() {
  removeAll = os.RemoveAll
 }
-
-func SetReadDir(f func(string) ([]os.FileInfo, error)) {
- readDir = f
-}
-
-func ResetReadDir() {
- readDir = ioutil.ReadDir
-}