Browse Source

pkg/homedir: remove deprecated Key() and GetShortcutString()

These were deprecated in ddd9665289fae5f2f62343d9355e9d5e1b97a2d8 (v25.0),
and 3c1de2e667f4ff99e2f05993e9fb5e66b1c77b68, and are no longer used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 year ago
parent
commit
2767d9ba05

+ 0 - 16
pkg/homedir/homedir.go

@@ -6,14 +6,6 @@ import (
 	"runtime"
 	"runtime"
 )
 )
 
 
-// Key returns the env var name for the user's home dir based on
-// the platform being run on.
-//
-// Deprecated: this function is no longer used, and will be removed in the next release.
-func Key() string {
-	return envKeyName
-}
-
 // Get returns the home directory of the current user with the help of
 // Get returns the home directory of the current user with the help of
 // environment variables depending on the target operating system.
 // environment variables depending on the target operating system.
 // Returned path should be used with "path/filepath" to form new paths.
 // Returned path should be used with "path/filepath" to form new paths.
@@ -34,11 +26,3 @@ func Get() string {
 	}
 	}
 	return home
 	return home
 }
 }
-
-// GetShortcutString returns the string that is shortcut to user's home directory
-// in the native shell of the platform running on.
-//
-// Deprecated: this function is no longer used, and will be removed in the next release.
-func GetShortcutString() string {
-	return homeShortCut
-}

+ 0 - 7
pkg/homedir/homedir_test.go

@@ -15,10 +15,3 @@ func TestGet(t *testing.T) {
 		t.Fatalf("returned path is not absolute: %s", home)
 		t.Fatalf("returned path is not absolute: %s", home)
 	}
 	}
 }
 }
-
-func TestGetShortcutString(t *testing.T) {
-	shortcut := GetShortcutString() //nolint:staticcheck // ignore SA1019 (GetShortcutString is deprecated)
-	if shortcut == "" {
-		t.Fatal("returned shortcut string is empty")
-	}
-}

+ 0 - 8
pkg/homedir/homedir_unix.go

@@ -1,8 +0,0 @@
-//go:build !windows
-
-package homedir // import "github.com/docker/docker/pkg/homedir"
-
-const (
-	envKeyName   = "HOME"
-	homeShortCut = "~"
-)

+ 0 - 6
pkg/homedir/homedir_windows.go

@@ -1,6 +0,0 @@
-package homedir // import "github.com/docker/docker/pkg/homedir"
-
-const (
-	envKeyName   = "USERPROFILE"
-	homeShortCut = "%USERPROFILE%" // be careful while using in format functions
-)