Merge pull request #37 from cloudfoundry/restructure-go-packages

Restructure go packages
cloudfoundry · Sep 5, 2024 · 3991f37 · 3991f37
2 parents b946056 + 81d49d5
commit 3991f37
Show file tree

Hide file tree

Showing 35 changed files with 227 additions and 534 deletions.
diff --git a/commandparser/commandparserfakes/fake_manager_factory.go b/commandparser/commandparserfakes/fake_manager_factory.go
diff --git a/commandparser/commandparserfakes/fake_packager_factory.go b/commandparser/commandparserfakes/fake_packager_factory.go
diff --git a/commandparser/commandparserfakes/fake_vmpreparer_factory.go b/commandparser/commandparserfakes/fake_vmpreparer_factory.go
diff --git a/commandparser/construct.go b/commandparser/construct.go
@@ -13,7 +13,6 @@ import (
 	"github.com/vmware/govmomi/object"
 
 	"github.com/cloudfoundry/stembuild/construct/config"
-	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory"
 	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/guest_manager"
 	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 )
@@ -35,13 +34,13 @@ type VCenterManager interface {
 
 //counterfeiter:generate . VMPreparerFactory
 type VMPreparerFactory interface {
-	VMPreparer(config config.SourceConfig, vCenterManager VCenterManager) (VmConstruct, error)
+	New(config config.SourceConfig, vCenterManager VCenterManager) (VmConstruct, error)
 }
 
 //counterfeiter:generate . ManagerFactory
 type ManagerFactory interface {
 	VCenterManager(ctx context.Context) (*vcenter_manager.VCenterManager, error)
-	SetConfig(config vcenterclientfactory.FactoryConfig)
+	SetConfig(config vcenter_manager.FactoryConfig)
 }
 
 //counterfeiter:generate . ConstructCmdValidator
@@ -139,12 +138,12 @@ func (p *ConstructCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfac
 		return subcommands.ExitFailure
 	}
 
-	p.managerFactory.SetConfig(vcenterclientfactory.FactoryConfig{
+	p.managerFactory.SetConfig(vcenter_manager.FactoryConfig{
 		VCenterServer:  p.sourceConfig.VCenterUrl,
 		Username:       p.sourceConfig.VCenterUsername,
 		Password:       p.sourceConfig.VCenterPassword,
-		ClientCreator:  &vcenterclientfactory.ClientCreator{},
-		FinderCreator:  &vcenterclientfactory.GovmomiFinderCreator{},
+		ClientCreator:  &vcenter_manager.ClientCreator{},
+		FinderCreator:  &vcenter_manager.GovmomiFinderCreator{},
 		RootCACertPath: p.sourceConfig.CaCertFile,
 	})
 
@@ -154,7 +153,7 @@ func (p *ConstructCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfac
 		return subcommands.ExitFailure
 	}
 
-	vmConstruct, err := p.prepFactory.VMPreparer(p.sourceConfig, vCenterManager)
+	vmConstruct, err := p.prepFactory.New(p.sourceConfig, vCenterManager)
 	if err != nil {
 		p.messenger.CannotPrepareVM(err)
 		return subcommands.ExitFailure

diff --git a/commandparser/construct_test.go b/commandparser/construct_test.go
@@ -157,7 +157,7 @@ var _ = Describe("construct", func() {
 			fakeValidator = &commandparserfakes.FakeConstructCmdValidator{}
 			fakeMessenger = &commandparserfakes.FakeConstructMessenger{}
 			fakeManagerFactory = &commandparserfakes.FakeManagerFactory{}
-			fakeFactory.VMPreparerReturns(fakeVmConstruct, nil)
+			fakeFactory.NewReturns(fakeVmConstruct, nil)
 
 			ConstrCmd = commandparser.NewConstructCmd(context.Background(), fakeFactory, fakeManagerFactory, fakeValidator, fakeMessenger)
 			ConstrCmd.SetFlags(f)

diff --git a/commandparser/package_stemcell.go b/commandparser/package_stemcell.go
@@ -23,7 +23,7 @@ type OSAndVersionGetter interface {
 
 //counterfeiter:generate . PackagerFactory
 type PackagerFactory interface {
-	Packager(sourceConfig config.SourceConfig, outputConfig config.OutputConfig, logger colorlogger.Logger) (Packager, error)
+	NewPackager(sourceConfig config.SourceConfig, outputConfig config.OutputConfig, logger colorlogger.Logger) (Packager, error)
 }
 
 //counterfeiter:generate . Packager
@@ -130,7 +130,7 @@ func (p *PackageCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{
 	}
 
 	logger := colorlogger.New(logLevel, p.GlobalFlags.Color, os.Stderr)
-	packager, err := p.packagerFactory.Packager(p.sourceConfig, p.outputConfig, logger)
+	packager, err := p.packagerFactory.NewPackager(p.sourceConfig, p.outputConfig, logger)
 	if err != nil {
 		p.packagerMessenger.CannotCreatePackager(err)
 		return subcommands.ExitFailure