From 1ec056f18f344ac0532d51b1ddb21016698a49e4 Mon Sep 17 00:00:00 2001 From: ivanovac Date: Wed, 14 Jan 2026 14:26:28 +0200 Subject: [PATCH] adopt switchblade v0.9.4 --- go.mod | 2 +- go.sum | 4 ++-- .../switchblade/internal/cloudfoundry/setup.go | 7 ++++++- vendor/modules.txt | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 03c67fb1c..372f54985 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( github.com/cloudfoundry/libbuildpack v0.0.0-20251203175254-7be530ec9fef - github.com/cloudfoundry/switchblade v0.9.3 + github.com/cloudfoundry/switchblade v0.9.4 github.com/onsi/ginkgo/v2 v2.27.2 github.com/onsi/gomega v1.38.2 github.com/sclevine/spec v1.4.0 diff --git a/go.sum b/go.sum index a2e253ccc..3fabd809c 100644 --- a/go.sum +++ b/go.sum @@ -812,8 +812,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.3 h1:BTtnDoWkClfzvlwWm37mylu0eFCZTwN62MtkskFOB2c= -github.com/cloudfoundry/switchblade v0.9.3/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo= +github.com/cloudfoundry/switchblade v0.9.4 h1:93O90a/DRRcZ4h50htDh4z7+FMliqy/lQH6IFgVa+mQ= +github.com/cloudfoundry/switchblade v0.9.4/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= diff --git a/vendor/github.com/cloudfoundry/switchblade/internal/cloudfoundry/setup.go b/vendor/github.com/cloudfoundry/switchblade/internal/cloudfoundry/setup.go index dd6ee2a42..8cd9c9b91 100644 --- a/vendor/github.com/cloudfoundry/switchblade/internal/cloudfoundry/setup.go +++ b/vendor/github.com/cloudfoundry/switchblade/internal/cloudfoundry/setup.go @@ -183,7 +183,12 @@ func (s Setup) Run(log io.Writer, home, name, source string) (string, error) { Env: env, }) if err != nil { - return "", fmt.Errorf("failed to create-shared-domain: %w\n\nOutput:\n%s", err, log) + logStr := log.(*bytes.Buffer).String() + if strings.Contains(logStr, "already in use") { + fmt.Fprintf(log, "TCP domain already exists, continuing...\n") + } else { + return "", fmt.Errorf("failed to create-shared-domain: %w\n\nOutput:\n%s", err, log) + } } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 270d25f5a..62acb4ee8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -26,7 +26,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.3 +# github.com/cloudfoundry/switchblade v0.9.4 ## explicit; go 1.23.0 github.com/cloudfoundry/switchblade github.com/cloudfoundry/switchblade/internal/cloudfoundry