Skip to content

Commit

Permalink
Add replace directive for cyphar/filepath-securejoin v0.3.6
Browse files Browse the repository at this point in the history 
There were API changes in
cyphar/filepath-securejoin@0c2fbe6
that cause `runc` compilation failure because `runc` hasn't updated
`cyphar/filepath-securejoin` yet. We see this error because of our
bump-deps job.

This change does a manual `go get -u ./... go@1.22.0 toolchain@go1.22.0`
and then pins `cyphar/filepath-securejoin` to the previous known
version until `runc` updates its dependencies and fixes the breakage.
  • Loading branch information
@rajathagasthya
rajathagasthya committed Jan 21, 2025
1 parent f26efc6 commit 1a3743f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
10 changes: 6 additions & 4 deletions src/bpm/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ module bpm

go 1.22.0

replace github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.3.6

require (
code.cloudfoundry.org/bytefmt v0.25.0
code.cloudfoundry.org/bytefmt v0.26.0
code.cloudfoundry.org/clock v1.28.0
code.cloudfoundry.org/lager/v3 v3.22.0
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
code.cloudfoundry.org/lager/v3 v3.23.0
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/kr/pty v1.1.8
github.com/moby/sys/mountinfo v0.7.2
Expand All @@ -31,7 +33,7 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/pprof v0.0.0-20250121033306-997b0b79cac0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/openzipkin/zipkin-go v0.4.3 // indirect
Expand Down
12 changes: 6 additions & 6 deletions src/bpm/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
code.cloudfoundry.org/bytefmt v0.25.0 h1:nGKr+VMSVjHYmVdIkFblfsNi2CefO5vURvM/zKXsBjY=
code.cloudfoundry.org/bytefmt v0.25.0/go.mod h1:XDUChKlvyhYeC7OxLZvNcsP4lTbE4oIGWNaRV6b4g4Y=
code.cloudfoundry.org/bytefmt v0.26.0 h1:Y+e2mA5vMnfud+Ja3YXhYY+w58XjxMW0mLLguCZnHtI=
code.cloudfoundry.org/bytefmt v0.26.0/go.mod h1:bpMhcxXR/MWxzFchxxoi5525Sr4QMvv20A7ni8MqZ1g=
code.cloudfoundry.org/clock v1.28.0 h1:pAF3ykQCUor1iQfhTHDG9IpavGh5/Uw4wbhF5Zl6I8E=
code.cloudfoundry.org/clock v1.28.0/go.mod h1:B1SaAriBEjF6FjXPlSS1bAPTNvJEnwuc+T5F0fiv+cQ=
code.cloudfoundry.org/lager/v3 v3.22.0 h1:F8+AuJb5Hh1KswKNlm0Qlafgrg4ESo0yZKHAnLDGV+U=
code.cloudfoundry.org/lager/v3 v3.22.0/go.mod h1:WbzeUscDNJxkBxCjOSHEdRF4KqxM9Y5QRhJoX3iqPOM=
code.cloudfoundry.org/lager/v3 v3.23.0 h1:xuRBOTLwboOnWkI5QpdfWf7C9LF+kpa4OKkfoMhspbw=
code.cloudfoundry.org/lager/v3 v3.23.0/go.mod h1:lyBGg9s6FMaodTgcZIuSQHW0TvF7mtznd8+e1xXfKhQ=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand All @@ -23,8 +23,8 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/google/pprof v0.0.0-20250121033306-997b0b79cac0 h1:EinjE47mmVVsxcjIwVKQWNY+3P+5R2BhkbULjhEDThc=
github.com/google/pprof v0.0.0-20250121033306-997b0b79cac0/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
Expand Down
9 changes: 5 additions & 4 deletions src/bpm/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# code.cloudfoundry.org/bytefmt v0.25.0
# code.cloudfoundry.org/bytefmt v0.26.0
## explicit; go 1.22.0
code.cloudfoundry.org/bytefmt
# code.cloudfoundry.org/clock v1.28.0
## explicit; go 1.22.0
code.cloudfoundry.org/clock
code.cloudfoundry.org/clock/fakeclock
# code.cloudfoundry.org/lager/v3 v3.22.0
# code.cloudfoundry.org/lager/v3 v3.23.0
## explicit; go 1.22.0
code.cloudfoundry.org/lager/v3
code.cloudfoundry.org/lager/v3/internal/truncate
Expand All @@ -17,7 +17,7 @@ github.com/coreos/go-systemd/v22/dbus
# github.com/creack/pty v1.1.7
## explicit
github.com/creack/pty
# github.com/cyphar/filepath-securejoin v0.3.6
# github.com/cyphar/filepath-securejoin v0.4.0 => github.com/cyphar/filepath-securejoin v0.3.6
## explicit; go 1.18
github.com/cyphar/filepath-securejoin
# github.com/go-logr/logr v1.4.2
Expand All @@ -37,7 +37,7 @@ github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/flags
github.com/google/go-cmp/cmp/internal/function
github.com/google/go-cmp/cmp/internal/value
# github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad
# github.com/google/pprof v0.0.0-20250121033306-997b0b79cac0
## explicit; go 1.22
github.com/google/pprof/profile
# github.com/inconshreveable/mousetrap v1.1.0
Expand Down Expand Up @@ -185,3 +185,4 @@ golang.org/x/tools/internal/versions
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.3.6

0 comments on commit 1a3743f

Please sign in to comment.