build: fix static errors from golangci-lint (ddev#6710)

ddev-test · Nov 11, 2024 · 5bb7523 · 5bb7523
1 parent da51ad4
commit 5bb7523
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/ddevapp/provider.go b/pkg/ddevapp/provider.go
@@ -301,7 +301,7 @@ func (p *Provider) getDownloadDir() string {
 	return destDir
 }
 
-func (p *Provider) doFilesPullCommand() (filename []string, error error) {
+func (p *Provider) doFilesPullCommand() ([]string, error) {
 	destDir := filepath.Join(p.getDownloadDir(), "files")
 	_ = os.RemoveAll(destDir)
 	_ = os.MkdirAll(destDir, 0755)
@@ -324,7 +324,7 @@ func (p *Provider) doFilesPullCommand() (filename []string, error error) {
 
 // getDatabaseBackups retrieves database using `generic backup database`, then
 // describe until it appears, then download it.
-func (p *Provider) getDatabaseBackups() (filename []string, error error) {
+func (p *Provider) getDatabaseBackups() ([]string, error) {
 	err := os.RemoveAll(p.getDownloadDir())
 	if err != nil {
 		return nil, err

diff --git a/pkg/globalconfig/global_config_test.go b/pkg/globalconfig/global_config_test.go
@@ -37,10 +37,10 @@ func TestGetFreePort(t *testing.T) {
 	// Put 100 used ports in the UsedHostPorts
 	i, err := strconv.Atoi(startPort)
 	i = i + 1
-	max := i + 100
+	maximum := i + 100
 	require.NoError(t, err)
 	ports := []string{}
-	for ; i < max; i++ {
+	for ; i < maximum; i++ {
 		ports = append(ports, strconv.Itoa(i))
 	}
 	// Make sure we have a global config set up.