Move iaas_clients/factory into iaas_clients/vcenter_manager

cloudfoundry · Jul 24, 2024 · d3c44e3 · d3c44e3
1 parent 9163d7f
commit d3c44e3
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 58 deletions.
diff --git a/commandparser/commandparserfakes/fake_manager_factory.go b/commandparser/commandparserfakes/fake_manager_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"
 )
@@ -41,7 +40,7 @@ type VMPreparerFactory interface {
 //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,
 	})
 

diff --git a/iaas_cli/iaas_clients/factory/factory_suite_test.go b/iaas_cli/iaas_clients/factory/factory_suite_test.go
diff --git a/iaas_cli/iaas_clients/iaas_clients_suite_test.go b/iaas_cli/iaas_clients/iaas_clients_suite_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/vmware/govmomi/object"
 
-	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory"
+	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 )
 
 func TestIaasClients(t *testing.T) {

diff --git a/iaas_cli/iaas_clients/vcenter_client_contract_test.go b/iaas_cli/iaas_clients/vcenter_client_contract_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/cloudfoundry/stembuild/iaas_cli"
-	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory"
+	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/iaas_cli/iaas_clients/vcenter_govmomi_contract_test.go b/iaas_cli/iaas_clients/vcenter_govmomi_contract_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"time"
 
-	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory"
 	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/guest_manager"
+	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/...lients/factory/vcenter_manager_factory.go → ...i/iaas_clients/vcenter_manager/factory.go b/...lients/factory/vcenter_manager_factory.go → ...i/iaas_clients/vcenter_manager/factory.go
@@ -1,4 +1,4 @@
-package vcenter_client_factory
+package vcenter_manager
 
 import (
 	"context"
@@ -10,8 +10,6 @@ import (
 	"github.com/vmware/govmomi/session"
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/soap"
-
-	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 )
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
@@ -63,7 +61,7 @@ func (f *ManagerFactory) SetConfig(config FactoryConfig) {
 	f.Config = config
 }
 
-func (f *ManagerFactory) VCenterManager(ctx context.Context) (*vcenter_manager.VCenterManager, error) {
+func (f *ManagerFactory) VCenterManager(ctx context.Context) (*VCenterManager, error) {
 
 	govmomiClient, err := f.govmomiClient(ctx)
 	if err != nil {
@@ -72,7 +70,7 @@ func (f *ManagerFactory) VCenterManager(ctx context.Context) (*vcenter_manager.V
 
 	finder := f.Config.FinderCreator.NewFinder(govmomiClient.Client, false)
 
-	return vcenter_manager.NewVCenterManager(govmomiClient, govmomiClient.Client, finder, f.Config.Username, f.Config.Password)
+	return NewVCenterManager(govmomiClient, govmomiClient.Client, finder, f.Config.Username, f.Config.Password)
 
 }
 

diff --git a/...s/factory/vcenter_manager_factory_test.go → ...s_clients/vcenter_manager/factory_test.go b/...s/factory/vcenter_manager_factory_test.go → ...s_clients/vcenter_manager/factory_test.go
@@ -1,4 +1,4 @@
-package vcenter_client_factory_test
+package vcenter_manager_test
 
 import (
 	"context"
@@ -10,34 +10,33 @@ import (
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/vim25"
 
-	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory"
-	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory/factoryfakes"
 	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
+	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager/vcenter_managerfakes"
 )
 
 var _ = Describe("VcenterManagerFactory", func() {
 
 	var (
-		managerFactory *vcenterclientfactory.ManagerFactory
+		managerFactory *vcenter_manager.ManagerFactory
 	)
 
 	BeforeEach(func() {
-		managerFactory = &vcenterclientfactory.ManagerFactory{}
+		managerFactory = &vcenter_manager.ManagerFactory{}
 	})
 
 	Context("VCenterManager", func() {
 		It("returns a vcenter manager", func() {
 
 			fakeVimClient := &vim25.Client{}
-			fakeClientCreator := &factoryfakes.FakeVim25ClientCreator{}
+			fakeClientCreator := &vcenter_managerfakes.FakeVim25ClientCreator{}
 
 			fakeClientCreator.NewClientReturns(fakeVimClient, nil)
 
 			fakeFinder := &find.Finder{}
-			fakeFinderCreator := &factoryfakes.FakeFinderCreator{}
+			fakeFinderCreator := &vcenter_managerfakes.FakeFinderCreator{}
 			fakeFinderCreator.NewFinderReturns(fakeFinder)
 
-			managerFactory.SetConfig(vcenterclientfactory.FactoryConfig{
+			managerFactory.SetConfig(vcenter_manager.FactoryConfig{
 				VCenterServer:  "example.com",
 				Username:       "user",
 				Password:       "pass",
@@ -54,9 +53,9 @@ var _ = Describe("VcenterManagerFactory", func() {
 		})
 
 		It("returns an error if the vcenter server cannot be parsed", func() {
-			fakeClientCreator := &factoryfakes.FakeVim25ClientCreator{}
+			fakeClientCreator := &vcenter_managerfakes.FakeVim25ClientCreator{}
 
-			managerFactory.SetConfig(vcenterclientfactory.FactoryConfig{
+			managerFactory.SetConfig(vcenter_manager.FactoryConfig{
 				VCenterServer: " :", // make soap.ParseURL fail with
 				Username:      "user",
 				Password:      "pass",
@@ -73,10 +72,10 @@ var _ = Describe("VcenterManagerFactory", func() {
 		It("returns an error if a vim25 client cannot be created", func() {
 
 			clientErr := errors.New("can't make a client")
-			fakeClientCreator := &factoryfakes.FakeVim25ClientCreator{}
+			fakeClientCreator := &vcenter_managerfakes.FakeVim25ClientCreator{}
 			fakeClientCreator.NewClientReturns(nil, clientErr)
 
-			managerFactory.SetConfig(vcenterclientfactory.FactoryConfig{
+			managerFactory.SetConfig(vcenter_manager.FactoryConfig{
 				VCenterServer: "example.com",
 				Username:      "user",
 				Password:      "pass",

diff --git a/iaas_cli/iaas_clients/vcenter_manager/vcenter_manager_test.go b/iaas_cli/iaas_clients/vcenter_manager/vcenter_manager_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25"
 
-	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"
 	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager/vcenter_managerfakes"
@@ -136,16 +135,16 @@ var _ = Describe("VcenterManager", func() {
 				inventoryPath := "/DC0/vm/DC0_H0_VM0"
 				clonePath := "/DC0/vm/DC0_H0_VM0_NewClone"
 
-				factoryConfig := &vcenterclientfactory.FactoryConfig{
+				factoryConfig := &vcenter_manager.FactoryConfig{
 					VCenterServer:  "https://user:pass@127.0.0.1:8989/sdk",
 					Username:       "user",
 					Password:       "pass",
-					ClientCreator:  &vcenterclientfactory.ClientCreator{},
-					FinderCreator:  &vcenterclientfactory.GovmomiFinderCreator{},
+					ClientCreator:  &vcenter_manager.ClientCreator{},
+					FinderCreator:  &vcenter_manager.GovmomiFinderCreator{},
 					RootCACertPath: CertPath,
 				}
 
-				managerFactory := &vcenterclientfactory.ManagerFactory{
+				managerFactory := &vcenter_manager.ManagerFactory{
 					Config: *factoryConfig,
 				}
 

diff --git a/...ctory/factoryfakes/fake_finder_creator.go → ...enter_managerfakes/fake_finder_creator.go b/...ctory/factoryfakes/fake_finder_creator.go → ...enter_managerfakes/fake_finder_creator.go
diff --git a/.../factoryfakes/fake_vim25client_creator.go → ..._managerfakes/fake_vim25client_creator.go b/.../factoryfakes/fake_vim25client_creator.go → ..._managerfakes/fake_vim25client_creator.go
diff --git a/main.go b/main.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cloudfoundry/stembuild/assets"
 	"github.com/cloudfoundry/stembuild/commandparser"
 	"github.com/cloudfoundry/stembuild/construct"
-	vcenterclientfactory "github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/factory"
+	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients/vcenter_manager"
 	"github.com/cloudfoundry/stembuild/package_stemcell/packager"
 	"github.com/cloudfoundry/stembuild/version"
 )
@@ -37,7 +37,7 @@ func main() {
 	var gf commandparser.GlobalFlags
 	packageCmd := commandparser.NewPackageCommand(version.NewVersionGetter(), &packager.Factory{}, &commandparser.PackageMessenger{Output: os.Stderr})
 	packageCmd.GlobalFlags = &gf
-	constructCmd := commandparser.NewConstructCmd(context.Background(), &construct.Factory{}, &vcenterclientfactory.ManagerFactory{}, &commandparser.ConstructValidator{}, &commandparser.ConstructCmdMessenger{OutputChannel: os.Stderr})
+	constructCmd := commandparser.NewConstructCmd(context.Background(), &construct.Factory{}, &vcenter_manager.ManagerFactory{}, &commandparser.ConstructValidator{}, &commandparser.ConstructCmdMessenger{OutputChannel: os.Stderr})
 	constructCmd.GlobalFlags = &gf
 
 	var commands = make([]subcommands.Command, 0)