Skip to content

Commit 2c4d382

Browse files
authored
Merge pull request #485 from cloudfoundry/adoptswitchblade092
Adopt switchblade v0.9.2 with CF API v3 support
2 parents b45d0e6 + 0ac0993 commit 2c4d382

318 files changed

Lines changed: 43524 additions & 2641 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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.0
8+
github.com/cloudfoundry/switchblade v0.9.2
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
@@ -19,15 +19,19 @@ require (
1919
github.com/Microsoft/go-winio v0.6.1 // indirect
2020
github.com/blang/semver v3.5.1+incompatible // indirect
2121
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
22-
github.com/docker/distribution v2.8.2+incompatible // indirect
23-
github.com/docker/docker v24.0.9+incompatible // indirect
22+
github.com/distribution/reference v0.6.0 // indirect
23+
github.com/docker/docker v27.5.1+incompatible // indirect
2424
github.com/docker/go-connections v0.4.0 // indirect
2525
github.com/docker/go-units v0.5.0 // indirect
2626
github.com/elazarl/goproxy v1.7.0 // indirect
27+
github.com/felixge/httpsnoop v1.0.4 // indirect
2728
github.com/fsnotify/fsnotify v1.8.0 // indirect
2829
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
30+
github.com/go-logr/logr v1.4.2 // indirect
31+
github.com/go-logr/stdr v1.2.2 // indirect
2932
github.com/gogo/protobuf v1.3.2 // indirect
3033
github.com/google/go-cmp v0.6.0 // indirect
34+
github.com/moby/docker-image-spec v1.3.1 // indirect
3135
github.com/nxadm/tail v1.4.11 // indirect
3236
github.com/opencontainers/go-digest v1.0.0 // indirect
3337
github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -39,6 +43,12 @@ require (
3943
github.com/tidwall/match v1.1.1 // indirect
4044
github.com/tidwall/pretty v1.2.1 // indirect
4145
github.com/ulikunitz/xz v0.5.12 // indirect
46+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
47+
go.opentelemetry.io/otel v1.32.0 // indirect
48+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
49+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
50+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
51+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
4252
golang.org/x/mod v0.22.0 // indirect
4353
golang.org/x/net v0.35.0 // indirect
4454
golang.org/x/sync v0.11.0 // indirect
@@ -49,3 +59,17 @@ require (
4959
gopkg.in/yaml.v2 v2.4.0 // indirect
5060
gopkg.in/yaml.v3 v3.0.1 // indirect
5161
)
62+
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+
)
71+
72+
replace (
73+
github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
74+
github.com/docker/docker => github.com/docker/docker v27.5.1+incompatible
75+
)

go.sum

Lines changed: 45 additions & 108 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 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: 5 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/initialize.go

Lines changed: 1 addition & 1 deletion
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/setup.go

Lines changed: 47 additions & 28 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: 20 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)