Skip to content

Commit 9c5448f

Browse files
authored
Merge pull request #488 from cloudfoundry/switchblade093
adopt switchblade 0.9.3
2 parents 9bd8b8e + 43586f3 commit 9c5448f

10 files changed

Lines changed: 160 additions & 38 deletions

File tree

go.mod

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ go 1.23.4
55
require (
66
github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
77
github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba
8-
github.com/cloudfoundry/switchblade v0.9.2
8+
github.com/cloudfoundry/switchblade v0.9.3
99
github.com/golang/mock v1.6.0
1010
github.com/kardolus/httpmock v0.0.0-20181110092731-53def6cd0f87
1111
github.com/onsi/ginkgo v1.16.5
1212
github.com/onsi/gomega v1.36.2
1313
github.com/sclevine/spec v1.4.0
14+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
15+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
1416
)
1517

1618
require (
@@ -19,6 +21,7 @@ require (
1921
github.com/Microsoft/go-winio v0.6.1 // indirect
2022
github.com/blang/semver v3.5.1+incompatible // indirect
2123
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
24+
github.com/containerd/log v0.1.0 // indirect
2225
github.com/distribution/reference v0.6.0 // indirect
2326
github.com/docker/docker v27.5.1+incompatible // indirect
2427
github.com/docker/go-connections v0.4.0 // indirect
@@ -38,36 +41,30 @@ require (
3841
github.com/paketo-buildpacks/packit v1.3.1 // indirect
3942
github.com/paketo-buildpacks/packit/v2 v2.16.0 // indirect
4043
github.com/pkg/errors v0.9.1 // indirect
44+
github.com/rogpeppe/go-internal v1.13.1 // indirect
4145
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
4246
github.com/tidwall/gjson v1.18.0 // indirect
4347
github.com/tidwall/match v1.1.1 // indirect
4448
github.com/tidwall/pretty v1.2.1 // indirect
4549
github.com/ulikunitz/xz v0.5.12 // indirect
4650
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
4751
go.opentelemetry.io/otel v1.32.0 // indirect
48-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
4952
go.opentelemetry.io/otel/metric v1.32.0 // indirect
50-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
5153
go.opentelemetry.io/otel/trace v1.32.0 // indirect
5254
golang.org/x/mod v0.22.0 // indirect
5355
golang.org/x/net v0.35.0 // indirect
5456
golang.org/x/sync v0.11.0 // indirect
5557
golang.org/x/sys v0.30.0 // indirect
5658
golang.org/x/text v0.22.0 // indirect
5759
golang.org/x/tools v0.29.0 // indirect
60+
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
61+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5862
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
5963
gopkg.in/yaml.v2 v2.4.0 // indirect
6064
gopkg.in/yaml.v3 v3.0.1 // indirect
6165
)
6266

63-
exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd
64-
65-
require (
66-
github.com/containerd/log v0.1.0 // indirect
67-
github.com/rogpeppe/go-internal v1.13.1 // indirect
68-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
69-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
70-
)
67+
exclude google.golang.org/genproto v0.0.0-20230403163135-ca9f95a91c1a
7168

7269
replace (
7370
github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible

go.sum

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
746746
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
747747
github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba h1:RdbOeYpXLO3wdrQrKuQFUIl7aLx6cdk95Lh/uFwAA9c=
748748
github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba/go.mod h1:kn4FHMwI8bTd9gT92wPGjXHzUvGcj8CkPxG8q3AGBAQ=
749-
github.com/cloudfoundry/switchblade v0.9.2 h1:b2lwxrAblg9uKncNQRKZ09/teuKdZIixcENKgrLQPjo=
750-
github.com/cloudfoundry/switchblade v0.9.2/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo=
749+
github.com/cloudfoundry/switchblade v0.9.3 h1:BTtnDoWkClfzvlwWm37mylu0eFCZTwN62MtkskFOB2c=
750+
github.com/cloudfoundry/switchblade v0.9.3/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo=
751751
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
752752
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
753753
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -2901,6 +2901,7 @@ google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q
29012901
google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA=
29022902
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
29032903
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
2904+
google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
29042905
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
29052906
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
29062907
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE=

vendor/github.com/cloudfoundry/switchblade/README.md

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/switchblade/deployment.go

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/switchblade/docker.go

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/switchblade/platform.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ github.com/cloudfoundry/libbuildpack/cutlass
2929
github.com/cloudfoundry/libbuildpack/cutlass/docker
3030
github.com/cloudfoundry/libbuildpack/cutlass/glow
3131
github.com/cloudfoundry/libbuildpack/packager
32-
# github.com/cloudfoundry/switchblade v0.9.2
32+
# github.com/cloudfoundry/switchblade v0.9.3
3333
## explicit; go 1.23.0
3434
github.com/cloudfoundry/switchblade
3535
github.com/cloudfoundry/switchblade/internal/cloudfoundry

0 commit comments

Comments
 (0)