use go-compose instead Signed-off-by: tensorworker <[email protected]>

Signed-off-by: tensorworker <[email protected]>

cmd/compose/compose.go

@@ -32,6 +32,7 @@ import (
 	"github.com/compose-spec/compose-go/v2/cli"
 	"github.com/compose-spec/compose-go/v2/dotenv"
 	"github.com/compose-spec/compose-go/v2/loader"
+	composepaths "github.com/compose-spec/compose-go/v2/paths"
 	"github.com/compose-spec/compose-go/v2/types"
 	composegoutils "github.com/compose-spec/compose-go/v2/utils"
 	"github.com/docker/buildx/util/logutil"
@@ -46,7 +47,6 @@ import (
 
 	"github.com/docker/compose/v5/cmd/display"
 	"github.com/docker/compose/v5/cmd/formatter"
-	"github.com/docker/compose/v5/internal/paths"
 	"github.com/docker/compose/v5/internal/tracing"
 	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/compose/v5/pkg/compose"
@@ -551,7 +551,7 @@ func RootCommand(dockerCli command.Cli, backendOptions *BackendOptions) *cobra.C
 				fmt.Fprint(os.Stderr, aec.Apply("option '--workdir' is DEPRECATED at root level! Please use '--project-directory' instead.\n", aec.RedF))
 			}
 			for i, file := range opts.EnvFiles {
-				file = paths.ExpandUser(file)
+				file = composepaths.ExpandUser(file)
 				if !filepath.IsAbs(file) {
 					file, err := filepath.Abs(file)
 					if err != nil {

internal/paths/paths.go

@@ -22,30 +22,6 @@ import (
 	"strings"
 )
 
-// ExpandUser expands a leading tilde (~) in a path to the user's home directory.
-// If the path doesn't start with ~, it is returned unchanged.
-// If the home directory cannot be determined, the original path is returned.
-func ExpandUser(path string) string {
-	if path == "" {
-		return path
-	}
-	if path[0] != '~' {
-		return path
-	}
-	if len(path) > 1 && path[1] != '/' && path[1] != filepath.Separator {
-		// ~otheruser/... syntax is not supported
-		return path
-	}
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return path
-	}
-	if len(path) == 1 {
-		return home
-	}
-	return filepath.Join(home, path[2:])
-}
-
 func IsChild(dir string, file string) bool {
 	if dir == "" {
 		return false

internal/paths/paths_test.go

@@ -1,84 +0,0 @@
-/*
-   Copyright 2020 Docker Compose CLI authors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package paths
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"gotest.tools/v3/assert"
-)
-
-func TestExpandUser(t *testing.T) {
-	home, err := os.UserHomeDir()
-	assert.NilError(t, err)
-
-	tests := []struct {
-		name     string
-		input    string
-		expected string
-	}{
-		{
-			name:     "empty string",
-			input:    "",
-			expected: "",
-		},
-		{
-			name:     "tilde only",
-			input:    "~",
-			expected: home,
-		},
-		{
-			name:     "tilde with slash",
-			input:    "~/.env",
-			expected: filepath.Join(home, ".env"),
-		},
-		{
-			name:     "tilde with subdir",
-			input:    "~/subdir/.env",
-			expected: filepath.Join(home, "subdir", ".env"),
-		},
-		{
-			name:     "absolute path unchanged",
-			input:    "/absolute/path/.env",
-			expected: "/absolute/path/.env",
-		},
-		{
-			name:     "relative path unchanged",
-			input:    "relative/path/.env",
-			expected: "relative/path/.env",
-		},
-		{
-			name:     "tilde in middle unchanged",
-			input:    "/path/~/file",
-			expected: "/path/~/file",
-		},
-		{
-			name:     "tilde other user unchanged",
-			input:    "~otheruser/.env",
-			expected: "~otheruser/.env",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := ExpandUser(tt.input)
-			assert.Equal(t, result, tt.expected)
-		})
-	}
-}