Remove duplicate workspace declaration in cmd/start.go

[ci skip]

Author: Anthony Emengo

cmd/root.go

@@ -140,7 +140,6 @@ func NewRoot(exit chan struct{}, ui UI, config config.Config, analyticsClient An
 			AnalyticsD:      analyticsD,
 			Provisioner:     provisioner,
 			Provision:       provision,
-			MetaDataReader:  workspace,
 			Stop:            stop,
 			OS:              &cfdevos.OS{},
 		}

cmd/start/start.go

@@ -70,18 +70,14 @@ type Stop interface {
 type Workspace interface {
 	CreateDirs() error
 	SetupState(depsFile string) error
+	Metadata() (workspace.Metadata, error)
 }
 
 //go:generate mockgen -package mocks -destination mocks/cache.go code.cloudfoundry.org/cfdev/cmd/start Cache
 type Cache interface {
 	Sync(resource.Catalog) error
 }
 
-//go:generate mockgen -package mocks -destination mocks/isoreader.go code.cloudfoundry.org/cfdev/cmd/start MetaDataReader
-type MetaDataReader interface {
-	Metadata() (workspace.Metadata, error)
-}
-
 type Args struct {
 	Registries          string
 	DeploySingleService string
@@ -96,7 +92,6 @@ type Start struct {
 	Exit            chan struct{}
 	UI              UI
 	Config          config.Config
-	MetaDataReader  MetaDataReader
 	Analytics       AnalyticsClient
 	AnalyticsToggle Toggle
 	Cache           Cache
@@ -212,7 +207,7 @@ func (s *Start) Execute(args Args) error {
 		return e.SafeWrap(err, "Unable to setup directories")
 	}
 
-	metaData, err := s.MetaDataReader.Metadata()
+	metaData, err := s.Workspace.Metadata()
 	if err != nil {
 		return e.SafeWrap(err, fmt.Sprintf("%s is not compatible with CF Dev. Please use a compatible file.", depsPath))
 	}

main.go

@@ -65,17 +65,17 @@ func main() {
 		os.Exit(1)
 	}
 
-	analyticsToggle := toggle.New(filepath.Join(conf.CFDevHome, "analytics", "analytics.txt"))
-	baseAnalyticsClient, _ := analytics.NewWithConfig(conf.AnalyticsKey, analytics.Config{
-		Logger: analytics.StdLogger(log.New(ioutil.Discard, "", 0)),
-	})
-
 	o := cfdevos.OS{}
 	osVersion, err := o.Version()
 	if err != nil {
 		osVersion = "unknown-os-version"
 	}
 
+	analyticsToggle := toggle.New(filepath.Join(conf.CFDevHome, "analytics", "analytics.txt"))
+	baseAnalyticsClient, _ := analytics.NewWithConfig(conf.AnalyticsKey, analytics.Config{
+		Logger: analytics.StdLogger(log.New(ioutil.Discard, "", 0)),
+	})
+
 	analyticsClient := cfanalytics.New(analyticsToggle, baseAnalyticsClient, conf.CliVersion.Original, osVersion, config.IsBehindProxy(), exitChan, ui)
 	defer analyticsClient.Close()