lint: update for Go 1.19 / golangci-lint 1.50.1

Signed-off-by: Milas Bowman <[email protected]>

Author: milas

.golangci.yml

@@ -6,30 +6,28 @@ linters:
   enable-all: false
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gocyclo
     - gofmt
     - goimports
-    - revive
     - gosimple
     - govet
     - ineffassign
     - lll
     - misspell
     - nakedret
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
 linters-settings:
   gocyclo:
     min-complexity: 16
   lll:
     line-length: 200
+  goimports:
+    local-prefixes: github.com/docker/compose-cli
 issues:
   # golangci hides some golint warnings (the warning about exported things
   # withtout documentation for example), this will make it show them anyway.

aci/backend_test.go

@@ -23,9 +23,10 @@ import (
 	"github.com/stretchr/testify/mock"
 	"gotest.tools/v3/assert"
 
+	"golang.org/x/oauth2"
+
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/containers"
-	"golang.org/x/oauth2"
 )
 
 func TestGetContainerName(t *testing.T) {

aci/compose.go

@@ -22,11 +22,12 @@ import (
 	"net/http"
 
 	"github.com/compose-spec/compose-go/types"
-	"github.com/docker/compose-cli/utils"
 	"github.com/docker/compose/v2/pkg/api"
 	"github.com/docker/compose/v2/pkg/progress"
 	"github.com/sirupsen/logrus"
 
+	"github.com/docker/compose-cli/utils"
+
 	"github.com/docker/compose-cli/aci/convert"
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/context/store"

aci/convert/convert.go

@@ -218,7 +218,7 @@ func (s serviceConfigAciHelper) getResourceRequestsLimits() (*containerinstance.
 	}
 
 	if hasCPURequest() {
-		cpuRequest, err = strconv.ParseFloat(s.Deploy.Resources.Reservations.NanoCPUs, 0)
+		cpuRequest, err = strconv.ParseFloat(s.Deploy.Resources.Reservations.NanoCPUs, 64)
 		if err != nil {
 			return nil, err
 		}
@@ -233,7 +233,7 @@ func (s serviceConfigAciHelper) getResourceRequestsLimits() (*containerinstance.
 			}
 		}
 		if s.Deploy.Resources.Limits.NanoCPUs != "" {
-			cpuLimit, err = strconv.ParseFloat(s.Deploy.Resources.Limits.NanoCPUs, 0)
+			cpuLimit, err = strconv.ParseFloat(s.Deploy.Resources.Limits.NanoCPUs, 64)
 			if err != nil {
 				return nil, err
 			}

aci/convert/registry_credentials.go

@@ -19,7 +19,7 @@ package convert
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -165,7 +165,7 @@ func (c cliRegistryHelper) autoLoginAcr(registry string, loginService login.Azur
 	if err != nil {
 		return errors.Wrap(err, "could not query ACR token")
 	}
-	bits, err := ioutil.ReadAll(res.Body)
+	bits, err := io.ReadAll(res.Body)
 	if err != nil {
 		return errors.Wrap(err, "could not read response body")
 	}

aci/convert/registry_credentials_test.go

@@ -25,10 +25,11 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/compose-spec/compose-go/types"
 	cliconfigtypes "github.com/docker/cli/cli/config/types"
-	"github.com/docker/compose-cli/aci/login"
 	"github.com/stretchr/testify/mock"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
+
+	"github.com/docker/compose-cli/aci/login"
 )
 
 const getAllCredentials = "getAllRegistryCredentials"

aci/convert/secrets.go

@@ -19,7 +19,7 @@ package convert
 import (
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path"
 	"strings"
 
@@ -43,7 +43,7 @@ func (p projectAciHelper) getAciSecretVolumes() ([]containerinstance.Volume, err
 	for _, svc := range p.Services {
 		squashedTargetVolumes := make(map[string]containerinstance.Volume)
 		for _, scr := range svc.Secrets {
-			data, err := ioutil.ReadFile(p.Secrets[scr.Source].File)
+			data, err := os.ReadFile(p.Secrets[scr.Source].File)
 			if err != nil {
 				return secretVolumes, err
 			}

aci/convert/secrets_test.go

@@ -18,7 +18,6 @@ package convert
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -31,7 +30,7 @@ func TestConvertSecrets(t *testing.T) {
 	serviceName := "testservice"
 	secretName := "testsecret"
 	absBasePath := "/home/user"
-	tmpFile, err := ioutil.TempFile(os.TempDir(), "TestConvertProjectSecrets-")
+	tmpFile, err := os.CreateTemp(os.TempDir(), "TestConvertProjectSecrets-")
 	assert.NilError(t, err)
 	_, err = tmpFile.Write([]byte("test content"))
 	assert.NilError(t, err)

aci/e2e/aci-demo/web/dispatcher.go

@@ -18,7 +18,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"math/rand"
 	"net"
@@ -75,7 +75,7 @@ func copy(url, ip string, w http.ResponseWriter) error {
 
 	w.Header().Set("source", ip)
 
-	buf, err := ioutil.ReadAll(resp.Body)
+	buf, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

aci/e2e/e2e-aci_test.go

@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"net/url"
@@ -533,10 +532,10 @@ func TestContainerRunAttached(t *testing.T) {
 }
 
 func overwriteFileStorageAccount(t *testing.T, absComposefileName string, storageAccount string) {
-	data, err := ioutil.ReadFile(absComposefileName)
+	data, err := os.ReadFile(absComposefileName)
 	assert.NilError(t, err)
 	override := strings.Replace(string(data), "dockertestvolumeaccount", storageAccount, 1)
-	err = ioutil.WriteFile(absComposefileName, []byte(override), 0644)
+	err = os.WriteFile(absComposefileName, []byte(override), 0644)
 	assert.NilError(t, err)
 }