Merge branch 'master' into update-libbuildpack-1764784867

Author: tnikolova82

VERSION

@@ -1 +1 @@
-1.8.41
+1.8.42

go.mod

@@ -5,8 +5,8 @@ go 1.23.4
 require (
 	github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
 	github.com/Masterminds/semver v1.5.0
-	github.com/cloudfoundry/libbuildpack v0.0.0-20251202224209-b07cc3dab65e
-	github.com/cloudfoundry/switchblade v0.9.0
+	github.com/cloudfoundry/libbuildpack v0.0.0-20251203175254-7be530ec9fef
+	github.com/cloudfoundry/switchblade v0.9.4
 	github.com/golang/mock v1.6.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.36.2
@@ -19,15 +19,20 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v27.4.1+incompatible // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/docker v27.5.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/elazarl/goproxy v1.2.8 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -40,6 +45,12 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
@@ -48,6 +59,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/docker/docker => github.com/docker/docker v24.0.2+incompatible
-
 replace github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
+
+// Fix ambiguous genproto imports
+replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240513163218-0867130af1f8

go.sum

@@ -49,14 +49,6 @@ dependencies:
   - cflinuxfs3
   source: https://nodejs.org/dist/v20.19.3/node-v20.19.3.tar.gz
   source_sha256: 4c9f238ad7c57af35efa6ba6259521aebbe20c2f91f6d846860a861c97fc6b99
-- name: node
-  version: 20.19.3
-  uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.19.3_linux_x64_cflinuxfs4_cae347d1.tgz
-  sha256: cae347d16d85ffea1633a11d032f4770be03fd675ea81e28cb0f548a145060e7
-  cf_stacks:
-  - cflinuxfs4
-  source: https://nodejs.org/dist/v20.19.3/node-v20.19.3.tar.gz
-  source_sha256: 4c9f238ad7c57af35efa6ba6259521aebbe20c2f91f6d846860a861c97fc6b99
 - name: node
   version: 20.19.5
   uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.19.5_linux_x64_cflinuxfs3_186f2ba5.tgz
@@ -73,6 +65,14 @@ dependencies:
   - cflinuxfs4
   source: https://nodejs.org/dist/v20.19.5/node-v20.19.5.tar.gz
   source_sha256: b34d3f57666d91deb6a148b604d7f2f4051d540087e9f6c627dedc1fcb866d5a
+- name: node
+  version: 20.20.0
+  uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.20.0_linux_x64_cflinuxfs4_0eeb6a6f.tgz
+  sha256: 0eeb6a6fc35674aaebb85e2cf8f94832d76a1d86bc48fb39da5a577d44772216
+  cf_stacks:
+  - cflinuxfs4
+  source: https://nodejs.org/dist/v20.20.0/node-v20.20.0.tar.gz
+  source_sha256: cafc92e90917c17869d982fdff10104c2eb328437ed9bbf03fdda78ebc0accdd
 - name: node
   version: 22.20.0
   uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_22.20.0_linux_x64_cflinuxfs4_088bdfa6.tgz
@@ -89,14 +89,6 @@ dependencies:
   - cflinuxfs4
   source: https://nodejs.org/dist/v22.21.1/node-v22.21.1.tar.gz
   source_sha256: 5407ff154708e3dd6c9eb40f787b79afc5db8b2461e4ae92ee54605515bba0f1
-- name: node
-  version: 24.3.0
-  uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.3.0_linux_x64_cflinuxfs4_b6ec3828.tgz
-  sha256: b6ec38289081a8514d5ebb9764140ece14d3636238381bf202f6e33f2c4f954c
-  cf_stacks:
-  - cflinuxfs4
-  source: https://nodejs.org/dist/v24.3.0/node-v24.3.0.tar.gz
-  source_sha256: f8cc1dcde9b76fa380765204fefbb98e51123e52c919ba4adcf4ccd235bbf70b
 - name: node
   version: 24.10.0
   uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.10.0_linux_x64_cflinuxfs4_11fdc5e5.tgz
@@ -105,6 +97,14 @@ dependencies:
   - cflinuxfs4
   source: https://github.com/nodejs/node/archive/v24.10.0.tar.gz
   source_sha256: e549f1e3d6f2ba0ced319a11624cdfe31a0ac35f9e1abf6f80c1d86cf5d86f51
+- name: node
+  version: 24.13.0
+  uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.13.0_linux_x64_cflinuxfs4_a816dee1.tgz
+  sha256: a816dee19024ef9a2e4d87e7cf6e826abec243262fa8050f9250892a8c29e988
+  cf_stacks:
+  - cflinuxfs4
+  source: https://nodejs.org/dist/v24.13.0/node-v24.13.0.tar.gz
+  source_sha256: 54cb58921b4ce2831c6690ee823a3d39cfbf2b75f4e556c4c2bde90f3d8fd1ca
 - name: python
   version: 3.11.14
   uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.11.14_linux_x64_cflinuxfs3_6d5446f5.tgz
@@ -115,8 +115,8 @@ dependencies:
   source_sha256: 563d2a1b2a5ba5d5409b5ecd05a0e1bf9b028cf3e6a6f0c87a5dc8dc3f2d9182
 - name: python
   version: 3.11.14
-  uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.11.14_linux_x64_cflinuxfs4_5d0a9d8b.tgz
-  sha256: 5d0a9d8bcea9ab75ffb927285f4ae79f3a47189a31d4eceac7842ec9131c8146
+  uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.11.14_linux_x64_cflinuxfs4_66f53248.tgz
+  sha256: 66f532488f868c421702755ad9e1e65e802b48f3881f1d198d66f9ff52ea463e
   cf_stacks:
   - cflinuxfs4
   source: https://www.python.org/ftp/python/3.11.14/Python-3.11.14.tgz

manifest.yml

@@ -148,10 +148,17 @@ function util::tools::cf::install() {
       exit 1
   esac
 
+  # Check if cf already exists in the target directory or system PATH
+  if [[ -f "${dir}/cf" ]] || command -v cf >/dev/null 2>&1; 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

scripts/.util/tools.sh

@@ -23,6 +23,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() {