Stop using dot-imports in tests

colorlogger/colorLogger_test.go

@@ -3,7 +3,7 @@ package colorlogger_test
 import (
 	"bytes"
 
-	. "github.com/cloudfoundry/stembuild/colorlogger"
+	"github.com/cloudfoundry/stembuild/colorlogger"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -13,45 +13,45 @@ var _ = Describe("Stdout", func() {
 	It("write debug output when log level is debug", func() {
 		buf := bytes.Buffer{}
 
-		Expect(DEBUG).To(Equal(0))
-		logger := ConstructLogger(DEBUG, false, &buf)
+		Expect(colorlogger.DEBUG).To(Equal(0))
+		logger := colorlogger.ConstructLogger(colorlogger.DEBUG, false, &buf)
 
 		message := "This is a test"
 
-		logger.Logf(DEBUG, message)
+		logger.Logf(colorlogger.DEBUG, message)
 		Expect(buf.String()).To(Equal("debug: " + message + "\n"))
 	})
 
 	It("write no debug output when log level is NONE", func() {
 		buf := bytes.Buffer{}
 
-		logger := ConstructLogger(NONE, false, &buf)
+		logger := colorlogger.ConstructLogger(colorlogger.NONE, false, &buf)
 
 		message := "This is a test"
 
-		logger.Logf(DEBUG, message)
+		logger.Logf(colorlogger.DEBUG, message)
 		Expect(buf.String()).To(BeEmpty())
 	})
 
 	It("write no none output when log level is NONE", func() {
 		buf := bytes.Buffer{}
 
-		logger := ConstructLogger(NONE, false, &buf)
+		logger := colorlogger.ConstructLogger(colorlogger.NONE, false, &buf)
 
 		message := "This is a test"
 
-		logger.Logf(NONE, message)
+		logger.Logf(colorlogger.NONE, message)
 		Expect(buf.String()).To(BeEmpty())
 	})
 
 	It("write colored debug output when log level is DEBUG and color is true", func() {
 		buf := bytes.Buffer{}
 
-		logger := ConstructLogger(DEBUG, true, &buf)
+		logger := colorlogger.ConstructLogger(colorlogger.DEBUG, true, &buf)
 
 		message := "This is a test"
 
-		logger.Logf(DEBUG, message)
+		logger.Logf(colorlogger.DEBUG, message)
 		Expect(buf.String()).To(Equal("\033[32mdebug:\033[0m " + message + "\n"))
 	})
 

commandparser/construct_helpers_test.go

@@ -3,7 +3,7 @@ package commandparser_test
 import (
 	"path/filepath"
 
-	. "github.com/cloudfoundry/stembuild/commandparser"
+	"github.com/cloudfoundry/stembuild/commandparser"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -20,7 +20,7 @@ var _ = Describe("construct_helpers", func() {
 					dir := filepath.Join("..", "test", "constructData", "emptyDir")
 
 					It("should return false with no error", func() {
-						present, err := IsArtifactInDirectory(dir, filename)
+						present, err := commandparser.IsArtifactInDirectory(dir, filename)
 						Expect(err).ToNot(HaveOccurred())
 						Expect(present).To(BeFalse())
 					})
@@ -30,7 +30,7 @@ var _ = Describe("construct_helpers", func() {
 					dir := filepath.Join("..", "test", "constructData", "fullDir")
 
 					It("should return true with no error", func() {
-						present, err := IsArtifactInDirectory(dir, filename)
+						present, err := commandparser.IsArtifactInDirectory(dir, filename)
 						Expect(err).ToNot(HaveOccurred())
 						Expect(present).To(BeTrue())
 					})
@@ -42,7 +42,7 @@ var _ = Describe("construct_helpers", func() {
 			filename := "file"
 			It("should return an error", func() {
 				dir := filepath.Join("..", "test", "constructData", "notExist")
-				_, err := IsArtifactInDirectory(dir, filename)
+				_, err := commandparser.IsArtifactInDirectory(dir, filename)
 				Expect(err).To(HaveOccurred())
 			})
 		})

commandparser/construct_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"flag"
 
-	. "github.com/cloudfoundry/stembuild/commandparser"
+	"github.com/cloudfoundry/stembuild/commandparser"
 	"github.com/cloudfoundry/stembuild/commandparser/commandparserfakes"
 	"github.com/google/subcommands"
 
@@ -20,11 +20,11 @@ var _ = Describe("construct", func() {
 	Describe("SetFlags", func() {
 
 		var f *flag.FlagSet
-		var ConstrCmd *ConstructCmd
+		var ConstrCmd *commandparser.ConstructCmd
 
 		BeforeEach(func() {
 			f = flag.NewFlagSet("test", flag.ContinueOnError)
-			ConstrCmd = &ConstructCmd{}
+			ConstrCmd = &commandparser.ConstructCmd{}
 			ConstrCmd.SetFlags(f)
 		})
 
@@ -138,8 +138,8 @@ var _ = Describe("construct", func() {
 	Describe("Execute", func() {
 
 		var f *flag.FlagSet
-		var gf *GlobalFlags
-		var ConstrCmd *ConstructCmd
+		var gf *commandparser.GlobalFlags
+		var ConstrCmd *commandparser.ConstructCmd
 		var emptyContext context.Context
 
 		var fakeFactory *commandparserfakes.FakeVMPreparerFactory
@@ -150,7 +150,7 @@ var _ = Describe("construct", func() {
 
 		BeforeEach(func() {
 			f = flag.NewFlagSet("test", flag.ExitOnError)
-			gf = &GlobalFlags{false, false, false}
+			gf = &commandparser.GlobalFlags{false, false, false}
 
 			fakeFactory = &commandparserfakes.FakeVMPreparerFactory{}
 			fakeVmConstruct = &commandparserfakes.FakeVmConstruct{}
@@ -159,7 +159,7 @@ var _ = Describe("construct", func() {
 			fakeManagerFactory = &commandparserfakes.FakeManagerFactory{}
 			fakeFactory.VMPreparerReturns(fakeVmConstruct, nil)
 
-			ConstrCmd = NewConstructCmd(context.Background(), fakeFactory, fakeManagerFactory, fakeValidator, fakeMessenger)
+			ConstrCmd = commandparser.NewConstructCmd(context.Background(), fakeFactory, fakeManagerFactory, fakeValidator, fakeMessenger)
 			ConstrCmd.SetFlags(f)
 			ConstrCmd.GlobalFlags = gf
 			emptyContext = context.Background()

commandparser/help_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	. "github.com/cloudfoundry/stembuild/commandparser"
+	"github.com/cloudfoundry/stembuild/commandparser"
 	"github.com/cloudfoundry/stembuild/version"
 	"github.com/google/subcommands"
 	. "github.com/onsi/ginkgo/v2"
@@ -24,7 +24,7 @@ var _ = Describe("help", func() {
 			buf := bytes.Buffer{}
 			fs := flag.NewFlagSet(path.Base(os.Args[0]), flag.ExitOnError)
 			commands := make([]subcommands.Command, 0)
-			sb := NewStembuildHelp(subcommands.DefaultCommander, fs, &commands)
+			sb := commandparser.NewStembuildHelp(subcommands.DefaultCommander, fs, &commands)
 
 			sb.Explain(&buf)
 

integration/construct/winrm_test.go

@@ -3,18 +3,18 @@ package construct_test
 import (
 	"path/filepath"
 
-	. "github.com/cloudfoundry/stembuild/remotemanager"
+	"github.com/cloudfoundry/stembuild/remotemanager"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("WinRM Remote Manager", func() {
 
-	var rm RemoteManager
+	var rm remotemanager.RemoteManager
 
 	BeforeEach(func() {
-		clientFactory := NewWinRmClientFactory(conf.TargetIP, conf.VMUsername, conf.VMPassword)
-		rm = NewWinRM(conf.TargetIP, conf.VMUsername, conf.VMPassword, clientFactory)
+		clientFactory := remotemanager.NewWinRmClientFactory(conf.TargetIP, conf.VMUsername, conf.VMPassword)
+		rm = remotemanager.NewWinRM(conf.TargetIP, conf.VMUsername, conf.VMPassword, clientFactory)
 		Expect(rm).ToNot(BeNil())
 	})
 

package_stemcell/config/output_config_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/cloudfoundry/stembuild/package_stemcell/config"
+	"github.com/cloudfoundry/stembuild/package_stemcell/config"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -13,36 +13,36 @@ var _ = Describe("OutputConfig", func() {
 	Describe("os", func() {
 		Context("no os specified", func() {
 			It("should be invalid", func() {
-				valid := IsValidOS("")
+				valid := config.IsValidOS("")
 				Expect(valid).To(BeFalse())
 			})
 		})
 		Context("a supported os is specified", func() {
 			It("2016 should be valid", func() {
-				valid := IsValidOS("2016")
+				valid := config.IsValidOS("2016")
 				Expect(valid).To(BeTrue())
 			})
 			It("2012R2 should be valid", func() {
-				valid := IsValidOS("2012R2")
+				valid := config.IsValidOS("2012R2")
 				Expect(valid).To(BeTrue())
 			})
 			It("1803 should be valid", func() {
-				valid := IsValidOS("1803")
+				valid := config.IsValidOS("1803")
 				Expect(valid).To(BeTrue())
 			})
 			It("2019 should be valid", func() {
-				valid := IsValidOS("2019")
+				valid := config.IsValidOS("2019")
 				Expect(valid).To(BeTrue())
 			})
 
 		})
 		Context("something other than a supported os is specified", func() {
 			It("should be invalid", func() {
-				valid := IsValidOS("bad-thing")
+				valid := config.IsValidOS("bad-thing")
 				Expect(valid).To(BeFalse())
 			})
 			It("1709 should be invalid", func() {
-				valid := IsValidOS("1709")
+				valid := config.IsValidOS("1709")
 				Expect(valid).To(BeFalse())
 			})
 		})
@@ -51,22 +51,22 @@ var _ = Describe("OutputConfig", func() {
 	Describe("stemcell version", func() {
 		Context("no stemcell version specified", func() {
 			It("should be invalid", func() {
-				valid := IsValidStemcellVersion("")
+				valid := config.IsValidStemcellVersion("")
 				Expect(valid).To(BeFalse())
 			})
 		})
 		Context("stemcell version specified is valid pattern", func() {
 			It("should be valid", func() {
 				valids := []string{"4.4", "4.4-build.1", "4.4.4", "4.4.4-build.4"}
 				for _, version := range valids {
-					valid := IsValidStemcellVersion(version)
+					valid := config.IsValidStemcellVersion(version)
 					Expect(valid).To(BeTrue())
 				}
 			})
 		})
 		Context("stemcell version specified is invalid pattern", func() {
 			It("should be invalid", func() {
-				valid := IsValidStemcellVersion("4.4.4.4")
+				valid := config.IsValidStemcellVersion("4.4.4.4")
 				Expect(valid).To(BeFalse())
 			})
 		})
@@ -75,7 +75,7 @@ var _ = Describe("OutputConfig", func() {
 	Describe("validateOutputDir", func() {
 		Context("no dir given", func() {
 			It("should be an error", func() {
-				err := ValidateOrCreateOutputDir("")
+				err := config.ValidateOrCreateOutputDir("")
 				Expect(err).To(HaveOccurred())
 			})
 		})
@@ -84,7 +84,7 @@ var _ = Describe("OutputConfig", func() {
 			It("should create the directory and not fail", func() {
 				err := os.RemoveAll(filepath.Join(".", "tmp"))
 				Expect(err).ToNot(HaveOccurred())
-				err = ValidateOrCreateOutputDir(filepath.Join(".", "tmp"))
+				err = config.ValidateOrCreateOutputDir(filepath.Join(".", "tmp"))
 				Expect(err).ToNot(HaveOccurred())
 				_, err = os.Stat(filepath.Join(filepath.Join(".", "tmp")))
 				Expect(err).ToNot(HaveOccurred())
@@ -99,7 +99,7 @@ var _ = Describe("OutputConfig", func() {
 			It("should not fail", func() {
 				err := os.Mkdir(filepath.Join(".", "tmp"), 0700)
 				Expect(err).ToNot(HaveOccurred())
-				err = ValidateOrCreateOutputDir(filepath.Join(".", "tmp"))
+				err = config.ValidateOrCreateOutputDir(filepath.Join(".", "tmp"))
 				Expect(err).ToNot(HaveOccurred())
 			})
 			AfterEach(func() {
@@ -112,7 +112,7 @@ var _ = Describe("OutputConfig", func() {
 			It("should not fail", func() {
 				cwd, err := os.Getwd()
 				Expect(err).ToNot(HaveOccurred())
-				err = ValidateOrCreateOutputDir(cwd)
+				err = config.ValidateOrCreateOutputDir(cwd)
 				Expect(err).ToNot(HaveOccurred())
 			})
 		})
@@ -121,7 +121,7 @@ var _ = Describe("OutputConfig", func() {
 			It("should be an error", func() {
 				err := os.RemoveAll(filepath.Join(".", "tmp"))
 				Expect(err).ToNot(HaveOccurred())
-				err = ValidateOrCreateOutputDir(filepath.Join(".", "tmp", "subtmp"))
+				err = config.ValidateOrCreateOutputDir(filepath.Join(".", "tmp", "subtmp"))
 				Expect(err).To(HaveOccurred())
 			})
 		})

package_stemcell/config/source_config_test.go

@@ -1,65 +1,65 @@
 package config_test
 
 import (
-	. "github.com/cloudfoundry/stembuild/package_stemcell/config"
+	"github.com/cloudfoundry/stembuild/package_stemcell/config"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("SourceConfig", func() {
 	Describe("GetSource", func() {
 		It("returns no error when VMDK configured correctly", func() {
-			config := SourceConfig{
+			srcConfig := config.SourceConfig{
 				Vmdk: "/some/path/to/a/file",
 			}
-			source, err := config.GetSource()
+			source, err := srcConfig.GetSource()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(source).To(Equal(VMDK))
+			Expect(source).To(Equal(config.VMDK))
 		})
 
 		It("returns an error when no configuration provided", func() {
-			config := SourceConfig{}
-			source, err := config.GetSource()
+			srcConfig := config.SourceConfig{}
+			source, err := srcConfig.GetSource()
 			Expect(err).To(MatchError("no configuration was provided"))
-			Expect(source).To(Equal(NIL))
+			Expect(source).To(Equal(config.NIL))
 		})
 
 		It("return no error when vCenter configured correctly", func() {
-			config := SourceConfig{
+			srcConfig := config.SourceConfig{
 				VmInventoryPath: "/my-datacenter/vm/my-folder/my-vm",
 				Username:        "user",
 				Password:        "pass",
 				URL:             "https://vcenter.test",
 			}
-			source, err := config.GetSource()
+			source, err := srcConfig.GetSource()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(source).To(Equal(VCENTER))
+			Expect(source).To(Equal(config.VCENTER))
 
 		})
 
 		It("returns an error when both VMDK and Vcenter configured", func() {
-			config := SourceConfig{
+			srcConfig := config.SourceConfig{
 				Vmdk:            "/some/path/to/a/file",
 				VmInventoryPath: "/my-datacenter/vm/my-folder/my-vm",
 				Username:        "user",
 				Password:        "pass",
 				URL:             "https://vcenter.test",
 			}
-			source, err := config.GetSource()
+			source, err := srcConfig.GetSource()
 			Expect(err).To(MatchError("configuration provided for VMDK & vCenter sources"))
-			Expect(source).To(Equal(NIL))
+			Expect(source).To(Equal(config.NIL))
 
 		})
 
 		It("returns an error when Vcenter configurations only partially specified", func() {
-			config := SourceConfig{
+			srcConfig := config.SourceConfig{
 				VmInventoryPath: "/my-datacenter/vm/my-folder/my-vm",
 				Username:        "user",
 				URL:             "https://vcenter.test",
 			}
-			source, err := config.GetSource()
+			source, err := srcConfig.GetSource()
 			Expect(err).To(MatchError("missing vCenter configurations"))
-			Expect(source).To(Equal(NIL))
+			Expect(source).To(Equal(config.NIL))
 		})
 
 	})