Fix stemcells with non-standard OVF names

Micah Young · Micah Young · commit 980dcd019fdf · 2020-05-01T13:29:28.000-04:00
- Stemcells from stembuild have OVFs named stembuild_target.ovf instead of image.ovf
diff --git a/src/bosh-vmrun-cpi/stemcell/client.go b/src/bosh-vmrun-cpi/stemcell/client.go
@@ -37,12 +37,16 @@ func (c StemcellClientImpl) ExtractOvf(stemcellTarballPath string) (string, erro
 		return "", bosherr.WrapErrorf(err, "Unpacking outer stemcell tarball '%s' to '%s'", stemcellTarballPath, c.parentTempDir)
 	}
 
-	imageOvfPath := filepath.Join(c.parentTempDir, "image.ovf")
-	if !c.fs.FileExists(imageOvfPath) {
-		return "", bosherr.Error("stemcell does not contain 'image.ovf'")
+	matches, err := filepath.Glob(filepath.Join(c.parentTempDir, "*.ovf"))
+	if err != nil {
+		return "", err
+	}
+
+	if len(matches) != 1 {
+		return "", bosherr.Error("stemcell does not contain a single ovf")
 	}
 
-	return imageOvfPath, nil
+	return matches[0], nil
 }
 
 func (c StemcellClientImpl) Cleanup() {

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,16 @@ func (c StemcellClientImpl) ExtractOvf(stemcellTarballPath string) (string, erro`
`37`	`37`	`return "", bosherr.WrapErrorf(err, "Unpacking outer stemcell tarball '%s' to '%s'", stemcellTarballPath, c.parentTempDir)`
`38`	`38`	`}`
`39`	`39`
`40`		`- imageOvfPath := filepath.Join(c.parentTempDir, "image.ovf")`
`41`		`- if !c.fs.FileExists(imageOvfPath) {`
`42`		`- return "", bosherr.Error("stemcell does not contain 'image.ovf'")`
	`40`	`+ matches, err := filepath.Glob(filepath.Join(c.parentTempDir, "*.ovf"))`
	`41`	`+ if err != nil {`
	`42`	`+ return "", err`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ if len(matches) != 1 {`
	`46`	`+ return "", bosherr.Error("stemcell does not contain a single ovf")`
`43`	`47`	`}`
`44`	`48`
`45`		`- return imageOvfPath, nil`
	`49`	`+ return matches[0], nil`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`func (c StemcellClientImpl) Cleanup() {`