Merge pull request #355 from milas/lint-fmt

Author: ndeloof

.gitattributes

@@ -0,0 +1,2 @@
+# required for golangci-lint on Windows
+*.go text eol=lf

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         cache: true
     - uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.51.1
+        version: v1.51.2
         args: --timeout 5m
     - name: Test
       run: go test ./...

golangci.yml renamed to .golangci.yml

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

ci/Dockerfile

@@ -279,7 +279,7 @@ func TestLoadFromFile(t *testing.T) {
 	}
 	tmpdir := t.TempDir()
 	tmpPath := filepath.Join(tmpdir, "Docker-compose.yaml")
-	if err := os.WriteFile(tmpPath, []byte(sampleYAML), 0444); err != nil {
+	if err := os.WriteFile(tmpPath, []byte(sampleYAML), 0o444); err != nil {
 		t.Fatalf("failed to write temporary file: %s", err)
 	}
 	actual, err := Load(types.ConfigDetails{

loader/loader_test.go

@@ -44,7 +44,7 @@ func isAbs(path string) (b bool) {
 
 // volumeNameLen returns length of the leading volume name on Windows.
 // It returns 0 elsewhere.
-//nolint: gocyclo
+// nolint: gocyclo
 func volumeNameLen(path string) int {
 	if len(path) < 2 {
 		return 0

loader/windows_path.go

@@ -52,6 +52,7 @@ func init() {
 }
 
 // Schema is the compose-spec JSON schema
+//
 //go:embed compose-spec.json
 var Schema string
 

schema/schema.go

@@ -107,7 +107,7 @@ type ServiceConfig struct {
 	// Command for the service containers.
 	// If set, overrides COMMAND from the image.
 	//
-	// Set to `[]` or `''` to clear the command from the image.
+	// Set to `[]` or an empty string to clear the command from the image.
 	Command ShellCommand `yaml:",omitempty" json:"command"` // NOTE: we can NOT omitempty for JSON! see ShellCommand type for details.
 
 	Configs           []ServiceConfigObjConfig `yaml:",omitempty" json:"configs,omitempty"`
@@ -126,7 +126,7 @@ type ServiceConfig struct {
 	// Entrypoint for the service containers.
 	// If set, overrides ENTRYPOINT from the image.
 	//
-	// Set to `[]` or `''` to clear the entrypoint from the image.
+	// Set to `[]` or an empty string to clear the entrypoint from the image.
 	Entrypoint ShellCommand `yaml:"entrypoint,omitempty" json:"entrypoint"` // NOTE: we can NOT omitempty for JSON! see ShellCommand type for details.
 
 	Environment     MappingWithEquals                `yaml:",omitempty" json:"environment,omitempty"`
@@ -333,13 +333,13 @@ type ThrottleDevice struct {
 // ShellCommand is a string or list of string args.
 //
 // When marshaled to YAML, nil command fields will be omitted if `omitempty`
-// is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `''`)
-// will serialize to an empty array (`[]`).
+// is specified as a struct tag. Explicitly empty commands (i.e. `[]` or
+// empty string will serialize to an empty array (`[]`).
 //
 // When marshaled to JSON, the `omitempty` struct must NOT be specified.
 // If the command field is nil, it will be serialized as `null`.
-// Explicitly empty commands (i.e. `[]` or `''`) will serialize to an empty
-// array (`[]`).
+// Explicitly empty commands (i.e. `[]` or empty string) will serialize to
+// an empty array (`[]`).
 //
 // The distinction between nil and explicitly empty is important to distinguish
 // between an unset value and a provided, but empty, value, which should be