Merge pull request #1481 from tpdownes/minor_changes

Address minor warnings and lint issues
GoogleCloudPlatform · Jun 20, 2023 · 65344ec · 65344ec
2 parents 562d2b1 + c903f30
commit 65344ec
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 20 deletions.
diff --git a/pkg/modulereader/resreader.go b/pkg/modulereader/resreader.go
@@ -145,7 +145,7 @@ func GetModuleInfo(source string, kind string) (ModuleInfo, error) {
 		modPath = source
 
 	default:
-		return ModuleInfo{}, fmt.Errorf("Source is not valid: %s", source)
+		return ModuleInfo{}, fmt.Errorf("source is not valid: %s", source)
 	}
 
 	reader := Factory(kind)

diff --git a/pkg/modulereader/resreader_test.go b/pkg/modulereader/resreader_test.go
@@ -24,7 +24,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/spf13/afero"
 	. "gopkg.in/check.v1"
 	"gopkg.in/yaml.v3"
 )
@@ -112,7 +111,7 @@ func (s *MySuite) TestGetModuleInfo_Embedded(c *C) {
 	// Invalid: Unsupported Module Source
 	badSource := "gcs::https://www.googleapis.com/storage/v1/GoogleCloudPlatform/hpc-toolkit/modules"
 	moduleInfo, err = GetModuleInfo(badSource, tfKindString)
-	expectedErr = "Source is not valid: .*"
+	expectedErr = "source is not valid: .*"
 	c.Assert(err, ErrorMatches, expectedErr)
 }
 
@@ -127,7 +126,7 @@ func (s *MySuite) TestGetModuleInfo_Git(c *C) {
 	// Invalid: Unsupported Module Source
 	badSource := "gcs::https://www.googleapis.com/storage/v1/GoogleCloudPlatform/hpc-toolkit/modules"
 	_, err = GetModuleInfo(badSource, tfKindString)
-	expectedErr = "Source is not valid: .*"
+	expectedErr = "source is not valid: .*"
 	c.Assert(err, ErrorMatches, expectedErr)
 }
 
@@ -148,19 +147,10 @@ func (s *MySuite) TestGetModuleInfo_Local(c *C) {
 	// Invalid: Unsupported Module Source
 	badSource := "gcs::https://www.googleapis.com/storage/v1/GoogleCloudPlatform/hpc-toolkit/modules"
 	moduleInfo, err = GetModuleInfo(badSource, tfKindString)
-	expectedErr = "Source is not valid: .*"
+	expectedErr = "source is not valid: .*"
 	c.Assert(err, ErrorMatches, expectedErr)
 }
 
-// hcl_utils.go
-func getTestFS() afero.IOFS {
-	aferoFS := afero.NewMemMapFs()
-	aferoFS.MkdirAll("modules/network/vpc", 0755)
-	afero.WriteFile(
-		aferoFS, "modules/network/vpc/main.tf", []byte(testMainTf), 0644)
-	return afero.NewIOFS(aferoFS)
-}
-
 func (s *MySuite) TestGetHCLInfo(c *C) {
 	// Invalid source path - path does not exists
 	fakePath := "./not/a/real/path"

diff --git a/pkg/sourcereader/embedded.go b/pkg/sourcereader/embedded.go
@@ -103,7 +103,7 @@ func (r EmbeddedSourceReader) GetModule(modPath string, copyPath string) error {
 		return fmt.Errorf("embedded file system is not initialized")
 	}
 	if !IsEmbeddedPath(modPath) {
-		return fmt.Errorf("Source is not valid: %s", modPath)
+		return fmt.Errorf("source is not valid: %s", modPath)
 	}
 
 	modDir, err := copyFSToTempDir(ModuleFS, modPath)

diff --git a/pkg/sourcereader/embedded_test.go b/pkg/sourcereader/embedded_test.go
@@ -153,7 +153,7 @@ func (s *MySuite) TestGetModule_Embedded(c *C) {
 	// Invalid: Unsupported Module Source by EmbeddedSourceReader
 	badSource := "gcs::https://www.googleapis.com/storage/v1/GoogleCloudPlatform/hpc-toolkit/modules"
 	err = reader.GetModule(badSource, dest)
-	expectedErr = "Source is not valid: .*"
+	expectedErr = "source is not valid: .*"
 	c.Assert(err, ErrorMatches, expectedErr)
 }
 

diff --git a/pkg/sourcereader/git.go b/pkg/sourcereader/git.go
@@ -59,7 +59,7 @@ func copyGitModules(srcPath string, destPath string) error {
 // GetModule copies the git source to a provided destination (the deployment directory)
 func (r GitSourceReader) GetModule(modPath string, copyPath string) error {
 	if !IsGitPath(modPath) {
-		return fmt.Errorf("Source is not valid: %s", modPath)
+		return fmt.Errorf("source is not valid: %s", modPath)
 	}
 
 	modDir, err := ioutil.TempDir("", "git-module-*")

diff --git a/pkg/sourcereader/git_test.go b/pkg/sourcereader/git_test.go
@@ -62,6 +62,6 @@ func (s *MySuite) TestGetModule_Git(c *C) {
 	// Invalid: Unsupported Module Source
 	badSource := "gcs::https://www.googleapis.com/storage/v1/GoogleCloudPlatform/hpc-toolkit/modules"
 	err = reader.GetModule(badSource, tfKindString)
-	expectedErr = "Source is not valid: .*"
+	expectedErr = "source is not valid: .*"
 	c.Assert(err, ErrorMatches, expectedErr)
 }
diff --git a/pkg/sourcereader/local.go b/pkg/sourcereader/local.go
@@ -25,7 +25,7 @@ type LocalSourceReader struct{}
 // GetModule copies the local source to a provided destination (the deployment directory)
 func (r LocalSourceReader) GetModule(modPath string, copyPath string) error {
 	if !IsLocalPath(modPath) {
-		return fmt.Errorf("Source is not valid: %s", modPath)
+		return fmt.Errorf("source is not valid: %s", modPath)
 	}
 
 	if _, err := os.Stat(modPath); os.IsNotExist(err) {

diff --git a/pkg/sourcereader/local_test.go b/pkg/sourcereader/local_test.go
@@ -122,6 +122,6 @@ func (s *MySuite) TestGetModule_Local(c *C) {
 	// Invalid: Unsupported Module Source by LocalSourceReader
 	badSource := "gcs::https://www.googleapis.com/storage/v1/GoogleCloudPlatform/hpc-toolkit/modules"
 	err = reader.GetModule(badSource, dest)
-	expectedErr = "Source is not valid: .*"
+	expectedErr = "source is not valid: .*"
 	c.Assert(err, ErrorMatches, expectedErr)
 }