Rename connection validator to a winrm concrete type

Co-authored-by: Daniel Basner <dbasner@pivotal.io>
cloudfoundry · Jan 15, 2020 · 731b1ec · 731b1ec
1 parent c7434ef
commit 731b1ec
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 24 deletions.
diff --git a/construct/constructfakes/fake_vmconnection_validator.go b/construct/constructfakes/fake_vmconnection_validator.go
diff --git a/construct/factory/vmconstruct_factory.go b/construct/factory/vmconstruct_factory.go
@@ -58,7 +58,7 @@ func (f *VMConstructFactory) VMPreparer(config config.SourceConfig, vCenterManag
 
 	remoteManager := NewWinRM(config.GuestVmIp, config.GuestVMUsername, config.GuestVMPassword)
 
-	vmConnectionValidator := &construct.VMConnectionValidator{
+	vmConnectionValidator := &construct.WinRMConnectionValidator{
 		RemoteManager: remoteManager,
 	}
 

diff --git a/construct/vmconstruct.go b/construct/vmconstruct.go
@@ -14,19 +14,19 @@ import (
 )
 
 type VMConstruct struct {
-	ctx                       context.Context
-	remoteManager             RemoteManager
-	Client                    IaasClient
-	guestManager              GuestManager
-	vmInventoryPath           string
-	vmUsername                string
-	vmPassword                string
-	winRMEnabler              WinRMEnabler
-	osValidator               OSValidator
-	vmAuthenticationValidator VMAuthenticationValidator
-	messenger                 ConstructMessenger
-	poller                    Poller
-	versionGetter             VersionGetter
+	ctx                   context.Context
+	remoteManager         RemoteManager
+	Client                IaasClient
+	guestManager          GuestManager
+	vmInventoryPath       string
+	vmUsername            string
+	vmPassword            string
+	winRMEnabler          WinRMEnabler
+	osValidator           OSValidator
+	vmConnectionValidator VMConnectionValidator
+	messenger             ConstructMessenger
+	poller                Poller
+	versionGetter         VersionGetter
 }
 
 const provisionDir = "C:\\provision\\"
@@ -48,7 +48,7 @@ func NewVMConstruct(
 	guestManager GuestManager,
 	winRMEnabler WinRMEnabler,
 	osValidator OSValidator,
-	vmAuthenticationValidator VMAuthenticationValidator,
+	vmConnectionValidator VMConnectionValidator,
 	messenger ConstructMessenger,
 	poller Poller,
 	versionGetter VersionGetter,
@@ -64,7 +64,7 @@ func NewVMConstruct(
 		vmPassword,
 		winRMEnabler,
 		osValidator,
-		vmAuthenticationValidator,
+		vmConnectionValidator,
 		messenger,
 		poller,
 		versionGetter,
@@ -97,8 +97,8 @@ type OSValidator interface {
 	Validate(stembuildVersion string) error
 }
 
-//go:generate counterfeiter . VMAuthenticationValidator
-type VMAuthenticationValidator interface {
+//go:generate counterfeiter . VMConnectionValidator
+type VMConnectionValidator interface {
 	Validate() error
 }
 
@@ -130,7 +130,7 @@ type Poller interface {
 
 func (c *VMConstruct) PrepareVM() error {
 	c.messenger.ValidateVMConnectionStarted()
-	err := c.vmAuthenticationValidator.Validate()
+	err := c.vmConnectionValidator.Validate()
 	if err != nil {
 		return err
 	}

diff --git a/construct/vm_connection_validator.go → construct/winrm_connection_validator.go b/construct/vm_connection_validator.go → construct/winrm_connection_validator.go
@@ -5,11 +5,11 @@ import (
 	"github.com/pkg/errors"
 )
 
-type VMConnectionValidator struct {
+type WinRMConnectionValidator struct {
 	RemoteManager RemoteManager
 }
 
-func (v *VMConnectionValidator) Validate() error {
+func (v *WinRMConnectionValidator) Validate() error {
 	err := v.RemoteManager.CanReachVM()
 	if err != nil {
 		return err

diff --git a/construct/vm_connection_validator_test.go → construct/winrm_connection_validator_test.go b/construct/vm_connection_validator_test.go → construct/winrm_connection_validator_test.go
@@ -12,14 +12,14 @@ import (
 
 var _ = Describe("VMConnectionValidator", func() {
 	var (
-		validator         *construct.VMConnectionValidator
+		validator         *construct.WinRMConnectionValidator
 		fakeRemoteManager *remotemanagerfakes.FakeRemoteManager
 	)
 
 	BeforeEach(func() {
 		fakeRemoteManager = &remotemanagerfakes.FakeRemoteManager{}
 
-		validator = &construct.VMConnectionValidator{
+		validator = &construct.WinRMConnectionValidator{
 			RemoteManager: fakeRemoteManager,
 		}
 	})

diff --git a/iaas_cli/iaas_clients/vcenter_client.go b/iaas_cli/iaas_clients/vcenter_client.go
@@ -15,7 +15,7 @@ import (
 type VcenterClient struct {
 	Url           string
 	credentialUrl string
-	redactedUrl string
+	redactedUrl   string
 	caCertFile    string
 	Runner        iaas_cli.CliRunner
 }