constants: Add AdminHelperPath() function

Author: cfergeau

pkg/crc/adminhelper/hosts.go

@@ -1,17 +1,11 @@
 package adminhelper
 
 import (
-	"path/filepath"
-
 	"github.com/crc-org/admin-helper/pkg/hosts"
 	"github.com/crc-org/admin-helper/pkg/types"
 	"github.com/crc-org/crc/pkg/crc/constants"
 )
 
-var (
-	BinPath = filepath.Join(constants.BinDir(), constants.GetAdminHelperExecutable())
-)
-
 // UpdateHostsFile updates the host's /etc/hosts file with Instance IP.
 func UpdateHostsFile(instanceIP string, hostnames ...string) error {
 	if err := RemoveFromHostsFile(hostnames...); err != nil {

pkg/crc/adminhelper/hosts_unix.go

@@ -5,11 +5,12 @@ package adminhelper
 
 import (
 	"github.com/crc-org/admin-helper/pkg/types"
+	"github.com/crc-org/crc/pkg/crc/constants"
 	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 func execute(args ...string) error {
-	_, _, err := crcos.RunWithDefaultLocale(BinPath, args...)
+	_, _, err := crcos.RunWithDefaultLocale(constants.AdminHelperPath(), args...)
 	return err
 }
 

pkg/crc/constants/constants.go

@@ -142,6 +142,10 @@ func BinDir() string {
 	return crcBinDir
 }
 
+func AdminHelperPath() string {
+	return filepath.Join(BinDir(), GetAdminHelperExecutable())
+}
+
 // GetHomeDir returns the home directory for the current user
 func GetHomeDir() string {
 	homeDir, err := os.UserHomeDir()