- switch non-vendor downloader call sites back to the vendored logger interface

- add a local helm v4 downloader command outside vendor
- restore repo builds with the current vendored utils state
- improve logr adapter formatting and StartWait fallback
- clean up helm test/build wiring and stale loft-util references

Signed-off-by: Ryan Swanson <ryan.swanson@loft.sh>

Author: zerbitx

.github/workflows/unit-tests.yaml

@@ -21,10 +21,10 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-    
+
     name: unit-test-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    
+
     steps:
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -34,10 +34,6 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1
 
-      - name: Uninstall Helm 3.x
-        run: |
-          sudo rm -rf $(which helm) || true
-        
       - name: Test
         shell: bash
         run: |

go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
 	github.com/loft-sh/go-github-selfupdate v1.0.0
-	github.com/loft-sh/loft-util v0.0.9-alpha
 	github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee
 	github.com/loft-sh/programming-language-detection v0.0.5
 	github.com/loft-sh/utils v0.0.16

go.sum

@@ -343,8 +343,6 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/loft-sh/go-github-selfupdate v1.0.0 h1:YS8iSsIWXw3BygBdPK2xDO4K84XYu2YuYgVS7eQNtik=
 github.com/loft-sh/go-github-selfupdate v1.0.0/go.mod h1:LDkR6J2QpqQLIMcYvNaSinVwvjPAkg8278oZBPGnrb8=
-github.com/loft-sh/loft-util v0.0.9-alpha h1:kGcyTQWxWHWy7bbjhS8Hsq/JRdlSztAU++anV6P+sqk=
-github.com/loft-sh/loft-util v0.0.9-alpha/go.mod h1:lsjG5Exh5iEf7Z/87nqwkxx3GRQTizFRLGuS1knF6Cg=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee h1:hZ79+pKEbCBrH1dVmgZ4jtFrrDPxgM4zqEP1lHlSnvI=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee/go.mod h1:pq83B8lgfCY7tKdegTTXU6DZxGQkcWMowUTOTpTQmqk=
 github.com/loft-sh/programming-language-detection v0.0.5 h1:XiWlxtrf4t6Z7SQiob0JMKaCeMHCP3kWhB80wLt+EMY=

hack/build-all.bash

@@ -43,11 +43,25 @@ mkdir -p "${DEVSPACE_ROOT}/release"
 
 # Install Helm 4
 echo "Installing helm"
-curl -s https://get.helm.sh/helm-v4.0.4-darwin-amd64.tar.gz > helm4.tar.gz && tar -zxvf helm4.tar.gz darwin-amd64/helm && chmod +x darwin-amd64/helm
+HELM_OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+HELM_ARCH=$(uname -m)
+case "${HELM_ARCH}" in
+  x86_64)
+    HELM_ARCH="amd64"
+    ;;
+  aarch64|arm64)
+    HELM_ARCH="arm64"
+    ;;
+  i386|i686)
+    HELM_ARCH="386"
+    ;;
+esac
+HELM_PLATFORM="${HELM_OS}-${HELM_ARCH}"
+curl -s "https://get.helm.sh/helm-v4.0.4-${HELM_PLATFORM}.tar.gz" > helm4.tar.gz && tar -zxvf helm4.tar.gz "${HELM_PLATFORM}/helm" && chmod +x "${HELM_PLATFORM}/helm"
 
 # Pull the component chart
 COMPONENT_CHART_VERSION=$(cat pkg/devspace/deploy/deployer/helm/client.go | grep 'Version: "' | sed -nE 's/[^"]+"(.+)",\s*/\1/p')
-darwin-amd64/helm pull component-chart --repo https://charts.devspace.sh --version $COMPONENT_CHART_VERSION
+"${HELM_PLATFORM}/helm" pull component-chart --repo https://charts.devspace.sh --version $COMPONENT_CHART_VERSION
 
 # Move ui.tar.gz to releases
 echo "Moving ui"
@@ -74,28 +88,28 @@ for OS in ${DEVSPACE_BUILD_PLATFORMS[@]}; do
     if [[ "${OS}" == "windows" ]]; then
       NAME="${NAME}.exe"
     fi
-    
+
     # darwin 386 is deprecated and shouldn't be used anymore
     if [[ "${ARCH}" == "386" && "${OS}" == "darwin" ]]; then
         echo "Building for ${OS}/${ARCH} not supported."
         continue
     fi
-    
+
     # arm64 build is only supported for darwin
     if [[ "${ARCH}" == "arm64" && "${OS}" == "windows" ]]; then
         echo "Building for ${OS}/${ARCH} not supported."
         continue
     fi
-    
+
     echo "Building for ${OS}/${ARCH}"
-    
+
     # build darwin with CGO_ENABLED=1
     if [[ "${OS}" == "darwin" ]]; then
       CGO_ENABLED=1
     else
-      CGO_ENABLED=0 
+      CGO_ENABLED=0
     fi
-    
+
     # build the DevSpace binary
     CGO_ENABLED=${CGO_ENABLED} GOARCH=${ARCH} GOOS=${OS} ${GO_BUILD_CMD} -ldflags "${GO_BUILD_LDFLAGS}"\
                   -o "${DEVSPACE_ROOT}/release/${NAME}" .

pkg/devspace/config/loader/variable/predefined_variable.go

@@ -55,7 +55,7 @@ var predefinedVars = map[string]PredefinedVariableFunction{
 	},
 	"DEVSPACE_KUBECTL_EXECUTABLE": func(ctx context.Context, options *PredefinedVariableOptions, logger log.Logger) (interface{}, error) {
 		debugLog := logger.WithLevel(logrus.DebugLevel)
-		path, err := downloader.NewDownloader(commands.NewKubectlCommand(), log.ToLogr(debugLog), constants.DefaultHomeDevSpaceFolder).EnsureCommand(ctx)
+		path, err := downloader.NewDownloader(commands.NewKubectlCommand(), debugLog, constants.DefaultHomeDevSpaceFolder).EnsureCommand(ctx)
 		if err != nil {
 			debugLog.Debugf("Error downloading kubectl: %v", err)
 			return "", nil