Skip to content

Commit

Permalink
Merge remote-tracking branch 'os-origin/main' into patch_app-isolation
Browse files Browse the repository at this point in the history
  • Loading branch information
joergdw committed Aug 16, 2024
2 parents e220bee + c8ae4ed commit e7d83d8
Show file tree
Hide file tree
Showing 17 changed files with 211 additions and 208 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cf 8.7.11
concourse 7.10.0
direnv 2.34.0
gcloud 473.0.0
ginkgo 2.19.0
ginkgo 2.20.0
golang 1.22.1
golangci-lint 1.59.1
java temurin-21.0.3+9.0.LTS
Expand Down
2 changes: 1 addition & 1 deletion ci/dockerfiles/autoscaler-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
gcloud version

# renovate: datasource=github-releases depName=ginkgo lookupName=onsi/ginkgo
ARG GINKGO_VERSION=v2.19.0
ARG GINKGO_VERSION=v2.20.0
RUN go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} && \
ginkgo version

Expand Down
64 changes: 32 additions & 32 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
"path:.#cloud-mta-build-tool": "",
"path:.#uaac": "",
"act": "0.2.64",
"actionlint": "1.7.1",
"bosh-cli": "7.3.1",
"bundix": "latest",
"cloudfoundry-cli": "8.7.10",
"actionlint": "1.7.1",
"bosh-cli": "7.3.1",
"bundix": "latest",
"coreutils": "latest",
"credhub-cli": "2.9.29",
"delve": "latest",
"direnv": "2.34.0",
"fly": "7.10.0",
"gh": "latest",
"ginkgo": "2.19.0",
"gnumake": "4.4",
"gnutar": "latest",
"go": "1.22.1",
"go-tools": "latest",
"credhub-cli": "2.9.29",
"delve": "latest",
"direnv": "2.34.0",
"fly": "7.10.0",
"gh": "latest",
"gnumake": "4.4",
"gnutar": "latest",
"go": "1.22.1",
"go-tools": "latest",
"golangci-lint": "1.59.1",
"google-cloud-sdk": "latest",
"gopls": "latest",
"gum": "0.13.0",
"jq": "latest",
"maven": "3.8.6",
"nodejs": "latest",
"nodePackages.yaml-language-server": "latest",
"oha": "latest",
"pre-commit": "latest",
"python": "latest",
"rubocop": "latest",
"ruby": "latest",
"rubyPackages.solargraph": "latest",
"shellcheck": "0.10.0",
"swagger-cli": "latest",
"temurin-bin-17": "latest",
"which": "latest",
"gopls": "latest",
"gum": "0.13.0",
"jq": "latest",
"maven": "3.8.6",
"nodejs": "latest",
"nodePackages.yaml-language-server": "latest",
"oha": "latest",
"pre-commit": "latest",
"python": "latest",
"rubocop": "latest",
"rubyPackages.solargraph": "latest",
"shellcheck": "0.10.0",
"swagger-cli": "latest",
"which": "latest",
"yq-go": "4.44.2",
"postgresql": "latest"
"postgresql": "latest",
"cloudfoundry-cli": "8.7.11",
"google-cloud-sdk": "latest",
"ginkgo": "2.20.0",
"temurin-bin-17": "latest",
"ruby": "latest"
},
"shell": {
"init_hook": [
Expand Down
49 changes: 24 additions & 25 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -193,51 +193,51 @@
}
}
},
"[email protected].10": {
"last_modified": "2024-07-07T07:43:47Z",
"resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#cloudfoundry-cli",
"[email protected].11": {
"last_modified": "2024-07-31T08:48:38Z",
"resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#cloudfoundry-cli",
"source": "devbox-search",
"version": "8.7.10",
"version": "8.7.11",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/0av52pwxa14gbbvhp53rawck7x6f18dy-cloudfoundry-cli-8.7.10",
"path": "/nix/store/6kldjvccz8bh4hl8zfippkmwa0lib99f-cloudfoundry-cli-8.7.11",
"default": true
}
],
"store_path": "/nix/store/0av52pwxa14gbbvhp53rawck7x6f18dy-cloudfoundry-cli-8.7.10"
"store_path": "/nix/store/6kldjvccz8bh4hl8zfippkmwa0lib99f-cloudfoundry-cli-8.7.11"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/vwxmhjskpjm8f5171q4kjhg7n7ws91n8-cloudfoundry-cli-8.7.10",
"path": "/nix/store/l838axzr5xxj896drsh5psc9h9vqy3zi-cloudfoundry-cli-8.7.11",
"default": true
}
],
"store_path": "/nix/store/vwxmhjskpjm8f5171q4kjhg7n7ws91n8-cloudfoundry-cli-8.7.10"
"store_path": "/nix/store/l838axzr5xxj896drsh5psc9h9vqy3zi-cloudfoundry-cli-8.7.11"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/yh39hjfqrmphxx3fx3lmk7hm0jm6h1zc-cloudfoundry-cli-8.7.10",
"path": "/nix/store/4lfpv97km2fbq6am7fahhx6bqzzs1vnx-cloudfoundry-cli-8.7.11",
"default": true
}
],
"store_path": "/nix/store/yh39hjfqrmphxx3fx3lmk7hm0jm6h1zc-cloudfoundry-cli-8.7.10"
"store_path": "/nix/store/4lfpv97km2fbq6am7fahhx6bqzzs1vnx-cloudfoundry-cli-8.7.11"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/jd9hm7lfn7xsc1hs8bnzf48j9hl3ihyp-cloudfoundry-cli-8.7.10",
"path": "/nix/store/acax9i2030p2cfaq8yhwqsg0g71wqzf0-cloudfoundry-cli-8.7.11",
"default": true
}
],
"store_path": "/nix/store/jd9hm7lfn7xsc1hs8bnzf48j9hl3ihyp-cloudfoundry-cli-8.7.10"
"store_path": "/nix/store/acax9i2030p2cfaq8yhwqsg0g71wqzf0-cloudfoundry-cli-8.7.11"
}
}
},
Expand Down Expand Up @@ -553,51 +553,51 @@
}
}
},
"ginkgo@2.19.0": {
"last_modified": "2024-07-20T09:11:00Z",
"resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#ginkgo",
"ginkgo@2.20.0": {
"last_modified": "2024-08-08T21:09:49Z",
"resolved": "github:NixOS/nixpkgs/13fe00cb6c75461901f072ae62b5805baef9f8b2#ginkgo",
"source": "devbox-search",
"version": "2.19.0",
"version": "2.20.0",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/0df3v1l69507ch21m4f5yjmqph6njr2a-ginkgo-2.19.0",
"path": "/nix/store/s38rkqbrfqwx0vwhikidmzaglsfgvapd-ginkgo-2.20.0",
"default": true
}
],
"store_path": "/nix/store/0df3v1l69507ch21m4f5yjmqph6njr2a-ginkgo-2.19.0"
"store_path": "/nix/store/s38rkqbrfqwx0vwhikidmzaglsfgvapd-ginkgo-2.20.0"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/n71yvwix1rkji7y2p0hird6rzxnb7hly-ginkgo-2.19.0",
"path": "/nix/store/gcr2704w8m41mzy9w3f54n40sbjq2qi2-ginkgo-2.20.0",
"default": true
}
],
"store_path": "/nix/store/n71yvwix1rkji7y2p0hird6rzxnb7hly-ginkgo-2.19.0"
"store_path": "/nix/store/gcr2704w8m41mzy9w3f54n40sbjq2qi2-ginkgo-2.20.0"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/hhr3kz63pcpvbrhlsvwrriqwdkyqi1dw-ginkgo-2.19.0",
"path": "/nix/store/4sfyf29dm2d6jahl8p2qcbr3r6kfz3bh-ginkgo-2.20.0",
"default": true
}
],
"store_path": "/nix/store/hhr3kz63pcpvbrhlsvwrriqwdkyqi1dw-ginkgo-2.19.0"
"store_path": "/nix/store/4sfyf29dm2d6jahl8p2qcbr3r6kfz3bh-ginkgo-2.20.0"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/8dkncfjlj1iavhvc5bym480c9asazlgh-ginkgo-2.19.0",
"path": "/nix/store/dzsgndcsg52dnvql57k0gq4vamm9ph11-ginkgo-2.20.0",
"default": true
}
],
"store_path": "/nix/store/8dkncfjlj1iavhvc5bym480c9asazlgh-ginkgo-2.19.0"
"store_path": "/nix/store/dzsgndcsg52dnvql57k0gq4vamm9ph11-ginkgo-2.20.0"
}
}
},
Expand Down Expand Up @@ -1666,7 +1666,6 @@
},
"ruby@latest": {
"last_modified": "2024-07-31T08:48:38Z",
"plugin_version": "0.0.2",
"resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#ruby_3_3",
"source": "devbox-search",
"version": "3.3.4",
Expand Down
5 changes: 3 additions & 2 deletions packages/eventgenerator/spec
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ files:
- autoscaler/vendor/github.com/go-logr/logr/funcr/* # gosub
- autoscaler/vendor/github.com/go-logr/stdr/* # gosub
- autoscaler/vendor/github.com/go-sql-driver/mysql/* # gosub
- autoscaler/vendor/github.com/google/uuid/* # gosub
- autoscaler/vendor/github.com/gorilla/mux/* # gosub
- autoscaler/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/internal/httprule/* # gosub
- autoscaler/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/* # gosub
Expand Down Expand Up @@ -106,15 +107,15 @@ files:
- autoscaler/vendor/go.opentelemetry.io/otel/propagation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/instrumentation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/env/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/x/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/resource/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.10.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.20.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.25.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.26.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/noop/* # gosub
Expand Down
5 changes: 2 additions & 3 deletions packages/golangapiserver/spec
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,15 @@ files:
- autoscaler/vendor/go.opentelemetry.io/otel/propagation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/instrumentation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/env/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/x/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/resource/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.10.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.19.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.20.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.25.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.26.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/noop/* # gosub
Expand Down
4 changes: 2 additions & 2 deletions packages/metricsforwarder/spec
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ files:
- autoscaler/vendor/go.opentelemetry.io/otel/propagation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/instrumentation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/env/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/x/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/resource/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.10.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.20.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.25.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.26.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/noop/* # gosub
Expand Down
4 changes: 2 additions & 2 deletions packages/operator/spec
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ files:
- autoscaler/vendor/go.opentelemetry.io/otel/propagation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/instrumentation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/env/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/x/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/resource/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.10.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.25.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.26.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/noop/* # gosub
Expand Down
6 changes: 2 additions & 4 deletions packages/scalingengine/spec
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,15 @@ files:
- autoscaler/vendor/go.opentelemetry.io/otel/propagation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/instrumentation/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/env/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/internal/x/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/resource/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/sdk/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/internal/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.10.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.19.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.20.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.25.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.26.0/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub
- autoscaler/vendor/go.opentelemetry.io/otel/trace/noop/* # gosub
Expand All @@ -155,7 +154,6 @@ files:
- autoscaler/vendor/golang.org/x/crypto/pbkdf2/* # gosub
- autoscaler/vendor/golang.org/x/exp/constraints/* # gosub
- autoscaler/vendor/golang.org/x/exp/maps/* # gosub
- autoscaler/vendor/golang.org/x/exp/slices/* # gosub
- autoscaler/vendor/golang.org/x/net/http/httpguts/* # gosub
- autoscaler/vendor/golang.org/x/net/idna/* # gosub
- autoscaler/vendor/golang.org/x/sync/errgroup/* # gosub
Expand Down
34 changes: 17 additions & 17 deletions src/acceptance/assets/app/go_app/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ require (
github.com/json-iterator/go v1.1.12
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
github.com/mitchellh/mapstructure v1.5.0
github.com/ogen-go/ogen v1.2.2
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/ogen-go/ogen v1.3.0
github.com/onsi/ginkgo/v2 v2.20.0
github.com/onsi/gomega v1.34.1
github.com/prometheus/procfs v0.15.1
github.com/steinfletcher/apitest v1.5.16
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.51.0
go.opentelemetry.io/otel v1.27.0
go.opentelemetry.io/otel/metric v1.27.0
go.opentelemetry.io/otel/sdk v1.27.0
go.opentelemetry.io/otel/trace v1.27.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/metric v1.28.0
go.opentelemetry.io/otel/sdk v1.28.0
go.opentelemetry.io/otel/trace v1.28.0
go.uber.org/zap v1.27.0
)

Expand All @@ -33,7 +33,7 @@ require (
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/dlclark/regexp2 v1.11.4 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
Expand All @@ -46,7 +46,7 @@ require (
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
Expand All @@ -60,14 +60,14 @@ require (
github.com/ugorji/go/codec v1.2.12 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit e7d83d8

Please sign in to comment.