Merge pull request #229 from ndeloof/lint-action

use golangci-lint action

Author: ulyssessouza

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Lint code
-        run: DOCKER_BUILDKIT=1 make lint
+        uses: golangci/golangci-lint-action@v2
       - name: Check license
         run: DOCKER_BUILDKIT=1 make check-license
 

ci/Dockerfile

@@ -16,7 +16,7 @@ FROM golang:1.17
 
 WORKDIR /go/src
 
-ARG GOLANGCILINT_VERSION=v1.24.0
+ARG GOLANGCILINT_VERSION=v1.44.1
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCILINT_VERSION}
 RUN go get -v -u github.com/kunalkushwaha/ltag && rm -rf /go/src/github.com/kunalkushwaha
 

cli/options_test.go

@@ -115,8 +115,8 @@ func TestProjectName(t *testing.T) {
 	})
 
 	t.Run("by COMPOSE_PROJECT_NAME", func(t *testing.T) {
-		os.Setenv("COMPOSE_PROJECT_NAME", "my_project_from_env")
-		defer os.Unsetenv("COMPOSE_PROJECT_NAME")
+		os.Setenv("COMPOSE_PROJECT_NAME", "my_project_from_env") //nolint:errcheck
+		defer os.Unsetenv("COMPOSE_PROJECT_NAME")                //nolint:errcheck
 		opts, err := NewProjectOptions([]string{"testdata/simple/compose.yaml"}, WithOsEnv)
 		assert.NilError(t, err)
 		p, err := ProjectFromOptions(opts)
@@ -129,7 +129,7 @@ func TestProjectName(t *testing.T) {
 		assert.NilError(t, err)
 		err = os.Chdir("testdata/env-file")
 		assert.NilError(t, err)
-		defer os.Chdir(wd)
+		defer os.Chdir(wd) //nolint:errcheck
 
 		opts, err := NewProjectOptions(nil, WithDotEnv, WithConfigFileEnv)
 		assert.NilError(t, err)
@@ -186,7 +186,7 @@ func TestProjectWithDotEnv(t *testing.T) {
 	assert.NilError(t, err)
 	err = os.Chdir("testdata/simple")
 	assert.NilError(t, err)
-	defer os.Chdir(wd)
+	defer os.Chdir(wd) //nolint:errcheck
 
 	opts, err := NewProjectOptions([]string{
 		"compose-with-variables.yaml",

golangci.yml

@@ -6,7 +6,7 @@ linters:
   enable:
   - gofmt
   - goimports
-  - golint
+  - revive
   - gosimple
   - ineffassign
   - misspell

interpolation/interpolation.go

@@ -115,7 +115,7 @@ func newPathError(path Path, err error) error {
 		return nil
 	case *template.InvalidTemplateError:
 		return errors.Errorf(
-			"invalid interpolation format for %s: %#v. You may need to escape any $ with another $.",
+			"invalid interpolation format for %s: %#v. You may need to escape any $ with another $",
 			path, err.Template)
 	default:
 		return errors.Wrapf(err, "error while interpolating %s", path)

interpolation/interpolation_test.go

@@ -74,7 +74,7 @@ func TestInvalidInterpolation(t *testing.T) {
 		},
 	}
 	_, err := Interpolate(services, Options{LookupValue: defaultMapping})
-	assert.Error(t, err, `invalid interpolation format for servicea.image: "${". You may need to escape any $ with another $.`)
+	assert.Error(t, err, `invalid interpolation format for servicea.image: "${". You may need to escape any $ with another $`)
 }
 
 func TestInterpolateWithDefaults(t *testing.T) {
@@ -133,7 +133,7 @@ func TestValidUnexistentInterpolation(t *testing.T) {
 
 	getFullErrorMsg := func(msg string) string {
 		return fmt.Sprintf("invalid interpolation format for myservice.environment.TESTVAR: "+
-			"\"required variable FOO is missing a value: %s\". You may need to escape any $ with another $.", msg)
+			"\"required variable FOO is missing a value: %s\". You may need to escape any $ with another $", msg)
 	}
 
 	for _, testcase := range testcases {

loader/loader.go

@@ -887,7 +887,7 @@ var transformDependsOnConfig TransformerFunc = func(data interface{}) (interface
 		for _, serviceIntf := range value {
 			service, ok := serviceIntf.(string)
 			if !ok {
-				return data, errors.Errorf("invalid type %T for service depends_on element. Expected string.", value)
+				return data, errors.Errorf("invalid type %T for service depends_on elementn, expected string", value)
 			}
 			transformed[service] = map[string]interface{}{"condition": types.ServiceConditionStarted}
 		}

loader/normalize.go

@@ -79,7 +79,7 @@ func normalize(project *types.Project, resolvePaths bool) error {
 				if resolvePaths {
 					s.Build.Context = localContext
 				}
-			} else {
+				// } else {
 				// might be a remote http/git context. Unfortunately supported "remote" syntax is highly ambiguous
 				// in moby/moby and not defined by compose-spec, so let's assume runtime will check
 			}

schema/schema.go

@@ -27,11 +27,6 @@ import (
 	_ "embed"
 )
 
-const (
-	defaultVersion = "1.0"
-	versionField   = "version"
-)
-
 type portsFormatChecker struct{}
 
 func (checker portsFormatChecker) IsFormat(input interface{}) bool {