Skip to content

Commit ce6ae1c

Browse files
authored
Merge pull request #1082 from cloudfoundry/adoptswitchblade092
Adopt switchblade v0.9.2 with CF API v3 support
2 parents f5af366 + 088db5f commit ce6ae1c

319 files changed

Lines changed: 43580 additions & 2674 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: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.24.0
77
require (
88
github.com/blang/semver v3.5.1+incompatible
99
github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba
10-
github.com/cloudfoundry/switchblade v0.9.0
10+
github.com/cloudfoundry/switchblade v0.9.2
1111
github.com/golang/mock v1.6.0
1212
github.com/kr/text v0.2.0
1313
github.com/onsi/ginkgo v1.16.5
@@ -21,15 +21,20 @@ require (
2121
github.com/Masterminds/semver v1.5.0 // indirect
2222
github.com/Microsoft/go-winio v0.6.2 // indirect
2323
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
24-
github.com/docker/distribution v2.8.3+incompatible // indirect
25-
github.com/docker/docker v27.4.1+incompatible // indirect
24+
github.com/containerd/log v0.1.0 // indirect
25+
github.com/distribution/reference v0.6.0 // indirect
26+
github.com/docker/docker v27.5.1+incompatible // indirect
2627
github.com/docker/go-connections v0.5.0 // indirect
2728
github.com/docker/go-units v0.5.0 // indirect
2829
github.com/elazarl/goproxy v1.2.8 // indirect
30+
github.com/felixge/httpsnoop v1.0.4 // indirect
2931
github.com/fsnotify/fsnotify v1.8.0 // indirect
3032
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
33+
github.com/go-logr/logr v1.4.2 // indirect
34+
github.com/go-logr/stdr v1.2.2 // indirect
3135
github.com/gogo/protobuf v1.3.2 // indirect
3236
github.com/google/go-cmp v0.6.0 // indirect
37+
github.com/moby/docker-image-spec v1.3.1 // indirect
3338
github.com/nxadm/tail v1.4.11 // indirect
3439
github.com/opencontainers/go-digest v1.0.0 // indirect
3540
github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -42,14 +47,24 @@ require (
4247
github.com/tidwall/match v1.1.1 // indirect
4348
github.com/tidwall/pretty v1.2.1 // indirect
4449
github.com/ulikunitz/xz v0.5.12 // indirect
50+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
51+
go.opentelemetry.io/otel v1.32.0 // indirect
52+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
53+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
54+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
55+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
4556
golang.org/x/net v0.34.0 // indirect
4657
golang.org/x/sys v0.29.0 // indirect
4758
golang.org/x/text v0.21.0 // indirect
59+
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
60+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
4861
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
4962
gopkg.in/yaml.v2 v2.4.0 // indirect
5063
gopkg.in/yaml.v3 v3.0.1 // indirect
5164
)
5265

53-
replace github.com/docker/docker => github.com/docker/docker v24.0.2+incompatible
66+
exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd
67+
68+
replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatible
5469

5570
replace github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible

go.sum

Lines changed: 43 additions & 69 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)