take-out implement zero byte files

metron2 · Jan 11, 2022 · 7292287 · 7292287
1 parent 018c189
commit 7292287
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/cmd/opts/opts.go b/cmd/opts/opts.go
@@ -360,10 +360,10 @@ type InterpolateArgs struct {
 }
 
 type TakeOutOpts struct {
-	Args         TakeOutArgs `positional-args:"true" required:"true"`
-	MirrorPrefix string      `long:"mirror-prefix" short:"m" description:"Mirror prefix" optional:"true" default:"file:"`
-	StemcellType string      `long:"stemcell-type" short:"t" description:"Stemcell type" optional:"true" default:"vsphere-esxi"`
-
+	Args               TakeOutArgs `positional-args:"true" required:"true"`
+	MirrorPrefix       string      `long:"mirror-prefix" short:"m" description:"Mirror prefix" optional:"true" default:"file:"`
+	StemcellType       string      `long:"stemcell-type" short:"t" description:"Stemcell type" optional:"true" default:"vsphere-esxi"`
+	CreatePlaceholders bool        `long:"create-placeholders" short:"p" description:"Create zero byte release and stemfill files (useful for diffs)"`
 	VarFlags
 	OpsFlags
 

diff --git a/cmd/take_out.go b/cmd/take_out.go
@@ -41,15 +41,15 @@ func (c TakeOutCmd) Run(opts TakeOutOpts) error {
 			c.ui.PrintLinef("Release does not have a URL for take_out; Name: %s / %s", r.Name, r.Version)
 			return bosherr.WrapErrorf(nil, "Provide an opsfile that has a URL or removes this release") // TODO
 		} else {
-			o, err := c.to.TakeOutRelease(r, c.ui, opts.MirrorPrefix)
+			o, err := c.to.TakeOutRelease(r, c.ui, opts)
 			if err != nil {
 				return err
 			}
 			releaseChanges = append(releaseChanges, o)
 		}
 	}
 	for _, s := range deployment.Stemcells {
-		err := c.to.TakeOutStemcell(s, c.ui, opts.StemcellType)
+		err := c.to.TakeOutStemcell(s, c.ui, opts)
 		if err != nil {
 
 		}

diff --git a/takeout/interfaces.go b/takeout/interfaces.go
@@ -1,6 +1,7 @@
 package takeout
 
 import (
+	"github.com/cloudfoundry/bosh-cli/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/director"
 	boshui "github.com/cloudfoundry/bosh-cli/ui"
 )
@@ -23,14 +24,14 @@ type DeploymentReader interface {
 }
 
 type ReleaseDownloader interface {
-	RetrieveRelease(r boshdir.ManifestRelease, ui boshui.UI, localFileName string) (err error)
+	RetrieveRelease(r boshdir.ManifestRelease, ui boshui.UI, localFileName string, opts opts.TakeOutOpts) (err error)
 }
 
 type StemcellDownloader interface {
-	TakeOutStemcell(s boshdir.ManifestReleaseStemcell, ui boshui.UI, stemCellType string) (err error)
+	TakeOutStemcell(s boshdir.ManifestReleaseStemcell, ui boshui.UI, opts opts.TakeOutOpts) (err error)
 	RetrieveStemcell(ui boshui.UI, s boshdir.ManifestReleaseStemcell, localFileName string, stemCellType string) (err error)
 }
 
 type OpFileGenerator interface {
-	TakeOutRelease(r boshdir.ManifestRelease, ui boshui.UI, mirrorPrefix string) (entry OpEntry, err error)
+	TakeOutRelease(r boshdir.ManifestRelease, ui boshui.UI, opts opts.TakeOutOpts) (entry OpEntry, err error)
 }
diff --git a/takeout/takeoutfakes/takeoutfakes.go b/takeout/takeoutfakes/takeoutfakes.go
@@ -3,6 +3,7 @@ package takeoutfakes
 import (
 	"errors"
 	"fmt"
+	. "github.com/cloudfoundry/bosh-cli/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/director"
 	"github.com/cloudfoundry/bosh-cli/takeout"
 	boshui "github.com/cloudfoundry/bosh-cli/ui"
@@ -17,7 +18,7 @@ func (c FakeUtensils) Reset() {
 	c.RetrieveMap = make(map[boshdir.ManifestRelease]string)
 }
 
-func (c FakeUtensils) RetrieveRelease(r boshdir.ManifestRelease, ui boshui.UI, localFileName string) (err error) {
+func (c FakeUtensils) RetrieveRelease(r boshdir.ManifestRelease, _ boshui.UI, localFileName string, _ TakeOutOpts) (err error) {
 	if val, ok := c.RetrieveMap[r]; ok {
 		return errors.New(fmt.Sprintf("Release already in download map: %s", val))
 	}

diff --git a/takeout/takeoutrelease.go b/takeout/takeoutrelease.go
@@ -3,6 +3,7 @@ package takeout
 import (
 	"crypto/sha1"
 	"fmt"
+	"github.com/cloudfoundry/bosh-cli/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/director"
 	boshui "github.com/cloudfoundry/bosh-cli/ui"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
@@ -18,12 +19,11 @@ var BadChar = regexp.MustCompile("[?=\"]")
 type RealUtensils struct {
 }
 
-func (c RealUtensils) RetrieveRelease(r boshdir.ManifestRelease, ui boshui.UI, localFileName string) (err error) {
+func (c RealUtensils) RetrieveRelease(r boshdir.ManifestRelease, ui boshui.UI, localFileName string, _ opts.TakeOutOpts) (err error) {
 	ui.PrintLinef("Downloading release: %s / %s -> %s", r.Name, r.Version, localFileName)
 
 	tempFileName := localFileName + ".download"
 
-
 	resp, err := http.Get(r.URL)
 
 	if resp != nil {
@@ -69,13 +69,16 @@ func (c RealUtensils) RetrieveRelease(r boshdir.ManifestRelease, ui boshui.UI, l
 	return nil
 }
 
-func (c RealUtensils) TakeOutStemcell(s boshdir.ManifestReleaseStemcell, ui boshui.UI, stemCellType string) (err error) {
+func (c RealUtensils) TakeOutStemcell(s boshdir.ManifestReleaseStemcell, ui boshui.UI, opts opts.TakeOutOpts) (err error) {
 
-	localFileName := fmt.Sprintf("bosh-%s-%s-go_agent-stemcell_v%s.tgz", stemCellType, s.OS, s.Version)
+	localFileName := fmt.Sprintf("bosh-%s-%s-go_agent-stemcell_v%s.tgz", opts.StemcellType, s.OS, s.Version)
 
 	if _, err := os.Stat(localFileName); os.IsNotExist(err) {
-
-		err := c.RetrieveStemcell(ui, s, localFileName, stemCellType)
+		if opts.CreatePlaceholders {
+			_, err = os.Create(localFileName)
+		} else {
+			err = c.RetrieveStemcell(ui, s, localFileName, opts.StemcellType)
+		}
 		if err != nil {
 			return err
 		}
@@ -121,13 +124,17 @@ func (c RealUtensils) RetrieveStemcell(ui boshui.UI, s boshdir.ManifestReleaseSt
 	return err
 }
 
-func (c RealUtensils) TakeOutRelease(r boshdir.ManifestRelease, ui boshui.UI, mirrorPrefix string) (entry OpEntry, err error) {
+func (c RealUtensils) TakeOutRelease(r boshdir.ManifestRelease, ui boshui.UI, opts opts.TakeOutOpts) (entry OpEntry, err error) {
 
 	// generate a local file name that's safe
 	localFileName := BadChar.ReplaceAllString(fmt.Sprintf("%s_v%s.tgz", r.Name, r.Version), "_")
 
 	if _, err := os.Stat(localFileName); os.IsNotExist(err) {
-		err = c.RetrieveRelease(r, ui, localFileName)
+		if opts.CreatePlaceholders {
+			_, err = os.Create(localFileName)
+		} else {
+			err = c.RetrieveRelease(r, ui, localFileName, opts)
+		}
 		if err != nil {
 			return OpEntry{}, err
 		}
@@ -136,7 +143,7 @@ func (c RealUtensils) TakeOutRelease(r boshdir.ManifestRelease, ui boshui.UI, mi
 	}
 	if len(r.Name) > 0 {
 		path := fmt.Sprintf("/releases/name=%s/url", r.Name)
-		localFile := fmt.Sprintf("%s%s", mirrorPrefix, localFileName)
+		localFile := fmt.Sprintf("%s%s", opts.MirrorPrefix, localFileName)
 		entry = OpEntry{Type: "replace", Path: path, Value: localFile}
 	}
 	return entry, err