Issue #356 Unpack bundle to disk on crc setup command

anjannath · praveenkumar · commit 69f693fe45ea · 2019-07-30T16:56:53.000+05:30
diff --git a/cmd/crc/cmd/config/config.go b/cmd/crc/cmd/config/config.go
@@ -33,6 +33,8 @@ var (
 	// Preflight checks
 	SkipCheckVirtualBoxInstalled = createSetting("skip-check-virtualbox-installed", nil, []validationFnType{validations.ValidateBool})
 	WarnCheckVirtualBoxInstalled = createSetting("warn-check-virtualbox-installed", nil, []validationFnType{validations.ValidateBool})
+	SkipCheckBundleCached        = createSetting("skip-check-bundle-cached", nil, []validationFnType{validations.ValidateBool})
+	WarnCheckBundleCached        = createSetting("warn-check-bundle-cached", true, []validationFnType{validations.ValidateBool})
 )
 
 // CreateSetting returns a filled struct of ConfigSetting
diff --git a/cmd/crc/cmd/start.go b/cmd/crc/cmd/start.go
@@ -78,7 +78,7 @@ func runStart(arguments []string) {
 
 func initStartCmdFlagSet() *pflag.FlagSet {
 	flagSet := pflag.NewFlagSet("start", pflag.ExitOnError)
-	flagSet.StringP(config.Bundle.Name, "b", constants.GetDefaultBundle(), "The system bundle used for deployment of the OpenShift cluster.")
+	flagSet.StringP(config.Bundle.Name, "b", constants.DefaultBundlePath, "The system bundle used for deployment of the OpenShift cluster.")
 	flagSet.StringP(config.VMDriver.Name, "d", machine.DefaultDriver.Driver, fmt.Sprintf("The driver to use for the CRC VM. Possible values: %v", machine.SupportedDriverValues()))
 	flagSet.StringP(config.PullSecretFile.Name, "p", "", fmt.Sprintf("File path of Image pull secret for User (Download it from %s)", constants.DefaultPullSecretURL))
 	flagSet.IntP(config.CPUs.Name, "c", constants.DefaultCPUs, "Number of CPU cores to allocate to the CRC VM")
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/code-ready/crc
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/DATA-DOG/godog v0.7.13
+	github.com/YourFin/binappend v0.0.0-20181105185800-0add4bf0b9ad
 	github.com/cavaliercoder/grab v2.0.0+incompatible
 	github.com/code-ready/clicumber v0.0.0-20190503113956-2563aed4ef12
 	github.com/code-ready/goodhosts v0.0.0-20190712111040-f090f3f77c26
diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/DATA-DOG/godog v0.7.13 h1:JmgpKcra7Vf3yzI9vPsWyoQRx13tyKziHtXWDCUUgok
 github.com/DATA-DOG/godog v0.7.13/go.mod h1:z2OZ6a3X0/YAKVqLfVzYBwFt3j6uSt3Xrqa7XTtcQE0=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
+github.com/YourFin/binappend v0.0.0-20181105185800-0add4bf0b9ad h1:OUogh+sUEo6yRwGEkqifcr3MfXNi0AtdCSwh7H8yTUM=
+github.com/YourFin/binappend v0.0.0-20181105185800-0add4bf0b9ad/go.mod h1:QhzJSct0NZ/q7HOtQrw867061u93HYPWa4KTotzdzls=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/bugsnag/bugsnag-go v1.5.1/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
diff --git a/pkg/crc/constants/constants_darwin.go b/pkg/crc/constants/constants_darwin.go
@@ -3,13 +3,18 @@ package constants
 import (
 	"fmt"
 	"github.com/code-ready/crc/pkg/crc/version"
+	"path/filepath"
 )
 
 const (
 	OcBinaryName = "oc"
 	DefaultOcURL = "https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/macosx/oc.tar.gz"
 )
 
+var (
+	DefaultBundlePath = filepath.Join(CrcBaseDir, GetDefaultBundle())
+)
+
 func GetDefaultBundle() string {
 	return fmt.Sprintf("crc_hyperkit_%s.crcbundle", version.GetBundleVersion())
 }
diff --git a/pkg/crc/constants/constants_linux.go b/pkg/crc/constants/constants_linux.go
@@ -3,13 +3,18 @@ package constants
 import (
 	"fmt"
 	"github.com/code-ready/crc/pkg/crc/version"
+	"path/filepath"
 )
 
 const (
 	OcBinaryName = "oc"
 	DefaultOcURL = "https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz"
 )
 
+var (
+	DefaultBundlePath = filepath.Join(CrcBaseDir, GetDefaultBundle())
+)
+
 func GetDefaultBundle() string {
 	return fmt.Sprintf("crc_libvirt_%s.crcbundle", version.GetBundleVersion())
 }
diff --git a/pkg/crc/constants/constants_windows.go b/pkg/crc/constants/constants_windows.go
@@ -3,13 +3,18 @@ package constants
 import (
 	"fmt"
 	"github.com/code-ready/crc/pkg/crc/version"
+	"path/filepath"
 )
 
 const (
 	OcBinaryName = "oc.exe"
 	DefaultOcURL = "https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/windows/oc.zip"
 )
 
+var (
+	DefaultBundlePath = filepath.Join(CrcBaseDir, GetDefaultBundle())
+)
+
 func GetDefaultBundle() string {
 	// TODO: we will change once we have correct bundle for windows
 	return fmt.Sprintf("crc_hyperv_%s.crcbundle", version.GetBundleVersion())
diff --git a/pkg/crc/preflight/preflight_checks_common.go b/pkg/crc/preflight/preflight_checks_common.go
@@ -0,0 +1,46 @@
+package preflight
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+
+	"github.com/YourFin/binappend"
+	"github.com/kardianos/osext"
+
+	"github.com/code-ready/crc/pkg/crc/constants"
+)
+
+func checkBundleCached() (bool, error) {
+	if _, err := os.Stat(constants.DefaultBundlePath); os.IsNotExist(err) {
+		return false, err
+	}
+	return true, nil
+}
+
+func fixBundleCached() (bool, error) {
+	if constants.BundleEmbedded() {
+		currentExecutable, err := osext.Executable()
+		if err != nil {
+			return false, err
+		}
+		extractor, err := binappend.MakeExtractor(currentExecutable)
+		if err != nil {
+			return false, err
+		}
+		f, err := os.Create(constants.DefaultBundlePath)
+		if err != nil {
+			return false, err
+		}
+		available := extractor.AvalibleData()
+		data, err := extractor.ByteArray(available[0])
+		if err != nil {
+			return false, err
+		}
+		w := bufio.NewWriter(f)
+		defer w.Flush()
+		w.Write(data)
+		return true, nil
+	}
+	return false, fmt.Errorf("CRC bundle is not embedded in the binary, see 'crc help' for more details.")
+}
diff --git a/pkg/crc/preflight/preflight_common.go b/pkg/crc/preflight/preflight_common.go
@@ -37,17 +37,16 @@ func preflightCheckAndFix(configuredToSkip bool, check, fix PreflightCheckFixFun
 	if ok {
 		return
 	}
-
-	if configuredToWarn {
-		logging.Warn(err.Error())
-		return
-	}
 	logging.Debug(err.Error())
 
 	ok, err = fix()
 	if ok {
 		return
 	}
 
+	if configuredToWarn {
+		logging.Warn(err.Error())
+		return
+	}
 	logging.Fatal(err.Error())
 }
diff --git a/pkg/crc/preflight/preflight_darwin.go b/pkg/crc/preflight/preflight_darwin.go
@@ -45,6 +45,11 @@ func StartPreflightChecks(vmDriver string) {
 		fmt.Sprintf("Checking file permissions for %s", hostFile),
 		config.GetBool(cmdConfig.WarnCheckResolvConfFilePermissions.Name),
 	)
+	preflightCheckSucceedsOrFails(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),
+		checkBundleCached,
+		"Checking if CRC bundle is cached in '$HOME/.crc'",
+		config.GetBool(cmdConfig.WarnCheckBundleCached.Name),
+	)
 }
 
 // SetupHost performs the prerequisite checks and setups the host to run the cluster
@@ -92,4 +97,10 @@ func SetupHost(vmDriver string) {
 		fmt.Sprintf("Setting file permissions for %s", hostFile),
 		config.GetBool(cmdConfig.WarnCheckResolvConfFilePermissions.Name),
 	)
+	preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),
+		checkBundleCached,
+		fixBundleCached,
+		"Unpacking bundle from the CRC binary",
+		config.GetBool(cmdConfig.WarnCheckBundleCached.Name),
+	)
 }
diff --git a/pkg/crc/preflight/preflight_linux.go b/pkg/crc/preflight/preflight_linux.go
@@ -67,6 +67,11 @@ func StartPreflightChecks(vmDriver string) {
 		"Checking if /etc/NetworkManager/dnsmasq.d/crc.conf exists",
 		config.GetBool(cmdConfig.WarnCheckCrcDnsmasqFile.Name),
 	)
+	preflightCheckSucceedsOrFails(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),
+		checkBundleCached,
+		"Checking if CRC bundle is cached in '$HOME/.crc'",
+		config.GetBool(cmdConfig.WarnCheckBundleCached.Name),
+	)
 }
 
 // SetupHost performs the prerequisite checks and setups the host to run the cluster
@@ -143,4 +148,10 @@ func SetupHost(vmDriver string) {
 		"Writing dnsmasq config for crc",
 		config.GetBool(cmdConfig.WarnCheckCrcDnsmasqFile.Name),
 	)
+	preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),
+		checkBundleCached,
+		fixBundleCached,
+		"Unpacking bundle from the CRC binary",
+		config.GetBool(cmdConfig.WarnCheckBundleCached.Name),
+	)
 }
diff --git a/pkg/crc/preflight/preflight_windows.go b/pkg/crc/preflight/preflight_windows.go
@@ -1,12 +1,22 @@
 package preflight
 
+import (
+	cmdConfig "github.com/code-ready/crc/cmd/crc/cmd/config"
+	"github.com/code-ready/crc/pkg/crc/config"
+)
+
 // StartPreflightChecks performs the preflight checks before starting the cluster
 func StartPreflightChecks(vmDriver string) {
 	preflightCheckSucceedsOrFails(false,
 		checkOcBinaryCached,
 		"Checking if oc binary is cached",
 		false,
 	)
+	preflightCheckSucceedsOrFails(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),
+		checkBundleCached,
+		"Checking if CRC bundle is cached in '$HOME/.crc'",
+		config.GetBool(cmdConfig.WarnCheckBundleCached.Name),
+	)
 }
 
 // SetupHost performs the prerequisite checks and setups the host to run the cluster
@@ -17,4 +27,10 @@ func SetupHost(vmDriver string) {
 		"Caching oc binary",
 		false,
 	)
+	preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),
+		checkBundleCached,
+		fixBundleCached,
+		"Unpacking bundle from the CRC binary",
+		config.GetBool(cmdConfig.WarnCheckBundleCached.Name),
+	)
 }
diff --git a/vendor/github.com/YourFin/binappend/.gitignore b/vendor/github.com/YourFin/binappend/.gitignore
diff --git a/vendor/github.com/YourFin/binappend/LICENCE b/vendor/github.com/YourFin/binappend/LICENCE
diff --git a/vendor/github.com/YourFin/binappend/README.md b/vendor/github.com/YourFin/binappend/README.md
diff --git a/vendor/github.com/YourFin/binappend/reading.go b/vendor/github.com/YourFin/binappend/reading.go
diff --git a/vendor/github.com/YourFin/binappend/writing.go b/vendor/github.com/YourFin/binappend/writing.go
diff --git a/vendor/modules.txt b/vendor/modules.txt

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ var (`
`33`	`33`	`// Preflight checks`
`34`	`34`	`SkipCheckVirtualBoxInstalled = createSetting("skip-check-virtualbox-installed", nil, []validationFnType{validations.ValidateBool})`
`35`	`35`	`WarnCheckVirtualBoxInstalled = createSetting("warn-check-virtualbox-installed", nil, []validationFnType{validations.ValidateBool})`
	`36`	`+ SkipCheckBundleCached = createSetting("skip-check-bundle-cached", nil, []validationFnType{validations.ValidateBool})`
	`37`	`+ WarnCheckBundleCached = createSetting("warn-check-bundle-cached", true, []validationFnType{validations.ValidateBool})`
`36`	`38`	`)`
`37`	`39`
`38`	`40`	`// CreateSetting returns a filled struct of ConfigSetting`
-Original file line number
+Diff line change
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/DATA-DOG/godog v0.7.13
 +	github.com/YourFin/binappend v0.0.0-20181105185800-0add4bf0b9ad
 	github.com/cavaliercoder/grab v2.0.0+incompatible
 	github.com/code-ready/clicumber v0.0.0-20190503113956-2563aed4ef12
 	github.com/code-ready/goodhosts v0.0.0-20190712111040-f090f3f77c26
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,18 @@ package constants`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"github.com/code-ready/crc/pkg/crc/version"`
	`6`	`+ "path/filepath"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`const (`
`9`	`10`	`OcBinaryName = "oc"`
`10`	`11`	`DefaultOcURL = "https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/macosx/oc.tar.gz"`
`11`	`12`	`)`
`12`	`13`
	`14`	`+var (`
	`15`	`+ DefaultBundlePath = filepath.Join(CrcBaseDir, GetDefaultBundle())`
	`16`	`+)`
	`17`	`+`
`13`	`18`	`func GetDefaultBundle() string {`
`14`	`19`	`return fmt.Sprintf("crc_hyperkit_%s.crcbundle", version.GetBundleVersion())`
`15`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ func StartPreflightChecks(vmDriver string) {`
`45`	`45`	`fmt.Sprintf("Checking file permissions for %s", hostFile),`
`46`	`46`	`config.GetBool(cmdConfig.WarnCheckResolvConfFilePermissions.Name),`
`47`	`47`	`)`
	`48`	`+ preflightCheckSucceedsOrFails(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),`
	`49`	`+ checkBundleCached,`
	`50`	`+ "Checking if CRC bundle is cached in '$HOME/.crc'",`
	`51`	`+ config.GetBool(cmdConfig.WarnCheckBundleCached.Name),`
	`52`	`+ )`
`48`	`53`	`}`
`49`	`54`
`50`	`55`	`// SetupHost performs the prerequisite checks and setups the host to run the cluster`
`@@ -92,4 +97,10 @@ func SetupHost(vmDriver string) {`
`92`	`97`	`fmt.Sprintf("Setting file permissions for %s", hostFile),`
`93`	`98`	`config.GetBool(cmdConfig.WarnCheckResolvConfFilePermissions.Name),`
`94`	`99`	`)`
	`100`	`+ preflightCheckAndFix(config.GetBool(cmdConfig.SkipCheckBundleCached.Name),`
	`101`	`+ checkBundleCached,`
	`102`	`+ fixBundleCached,`
	`103`	`+ "Unpacking bundle from the CRC binary",`
	`104`	`+ config.GetBool(cmdConfig.WarnCheckBundleCached.Name),`
	`105`	`+ )`
`95`	`106`	`}`