Upgrade to switchblade v0.9.2 for CF API v3 compatibility

Author: ivanovac

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
 	github.com/Masterminds/semver v1.5.0
 	github.com/cloudfoundry/libbuildpack v0.0.0-20251203175254-7be530ec9fef
-	github.com/cloudfoundry/switchblade v0.9.1
+	github.com/cloudfoundry/switchblade v0.9.2-0.20251205151235-f452557fbc4b
 	github.com/golang/mock v1.6.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.36.2

go.sum

@@ -478,8 +478,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
 github.com/cloudfoundry/libbuildpack v0.0.0-20251203175254-7be530ec9fef h1:lrggsL5p4dr3bBK/x1xIu3sn/6PGYV71GQIe/mCNfFw=
 github.com/cloudfoundry/libbuildpack v0.0.0-20251203175254-7be530ec9fef/go.mod h1:kn4FHMwI8bTd9gT92wPGjXHzUvGcj8CkPxG8q3AGBAQ=
-github.com/cloudfoundry/switchblade v0.9.1 h1:WHEUhSnkoqCJOkqJ1WD3XcmKztpYmagdIWT+GJf6Gfc=
-github.com/cloudfoundry/switchblade v0.9.1/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo=
+github.com/cloudfoundry/switchblade v0.9.2-0.20251205151235-f452557fbc4b h1:BkOKz3IOwZyq3A3tc9iWiZENPUDyQRD2X5dchveYOEM=
+github.com/cloudfoundry/switchblade v0.9.2-0.20251205151235-f452557fbc4b/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

scripts/.util/tools.sh

@@ -148,10 +148,17 @@ function util::tools::cf::install() {
       exit 1
   esac
 
+  # Check if cf is already available in PATH (e.g., from system/Docker image)
+  if command -v cf &> /dev/null; then
+    util::print::title "CF CLI already installed (using system version)"
+    cf version
+    return 0
+  fi
+
   if [[ ! -f "${dir}/cf" ]]; then
     util::print::title "Installing cf"
 
-    curl "https://packages.cloudfoundry.org/stable?release=${os}-binary&version=6.49.0&source=github-rel" \
+    curl "https://packages.cloudfoundry.org/stable?release=${os}-binary&source=github-rel" \
       --silent \
       --location \
       --output /tmp/cf.tar.gz

src/nodejs/integration/override_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/cloudfoundry/switchblade"
 	"github.com/sclevine/spec"
 
-	. "github.com/cloudfoundry/switchblade/matchers"
 	. "github.com/onsi/gomega"
 )
 
@@ -23,6 +22,7 @@ func testOverride(platform switchblade.Platform, fixtures string) func(*testing.
 			var err error
 			name, err = switchblade.RandomName()
 			Expect(err).NotTo(HaveOccurred())
+			println(name)
 		})
 
 		it.After(func() {
@@ -37,13 +37,15 @@ func testOverride(platform switchblade.Platform, fixtures string) func(*testing.
 				).
 				Execute(name, filepath.Join(fixtures, "simple"))
 			Expect(err).To(HaveOccurred())
-
-			Expect(logs.String()).To(SatisfyAll(
-				ContainLines(ContainSubstring("-----> OverrideYML Buildpack")),
-				ContainLines(ContainSubstring("-----> Installing node")),
-				ContainLines(MatchRegexp("Copy .*/node.tgz")),
-				ContainLines(ContainSubstring("Unable to install node: dependency sha256 mismatch: expected sha256 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc, actual sha256 b56b58ac21f9f42d032e1e4b8bf8b8823e69af5411caa15aee2b140bc756962f")),
-			))
+			Expect(err).To(MatchError(ContainSubstring("App staging failed")))
+
+			// Switchblade now automatically captures staging logs in CF API v3
+			// by fetching them using 'cf logs --recent' when staging fails
+			logsStr := logs.String()
+			Expect(logsStr).To(ContainSubstring("-----> OverrideYML Buildpack"))
+			Expect(logsStr).To(ContainSubstring("-----> Installing node"))
+			Expect(logsStr).To(MatchRegexp(`Copy .*/node.tgz`))
+			Expect(logsStr).To(ContainSubstring("Unable to install node: dependency sha256 mismatch: expected sha256 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc, actual sha256 b56b58ac21f9f42d032e1e4b8bf8b8823e69af5411caa15aee2b140bc756962f"))
 		})
 	}
 }

vendor/github.com/cloudfoundry/switchblade/internal/cloudfoundry/stage.go

@@ -30,7 +30,7 @@ github.com/cloudfoundry/libbuildpack/cutlass
 github.com/cloudfoundry/libbuildpack/cutlass/docker
 github.com/cloudfoundry/libbuildpack/cutlass/glow
 github.com/cloudfoundry/libbuildpack/packager
-# github.com/cloudfoundry/switchblade v0.9.1
+# github.com/cloudfoundry/switchblade v0.9.2-0.20251205151235-f452557fbc4b
 ## explicit; go 1.23.0
 github.com/cloudfoundry/switchblade
 github.com/cloudfoundry/switchblade/internal/cloudfoundry