Single a single standalone module for guardian - #512
Open
winkingturtle-vmw wants to merge 1996 commits into
Open
Single a single standalone module for guardian#512winkingturtle-vmw wants to merge 1996 commits into
winkingturtle-vmw wants to merge 1996 commits into
Conversation
-------- index 1924d4a..3fb0653 100644 @@ -5,11 +5,11 @@ go 1.22.0 toolchain go1.22.3 - code.cloudfoundry.org/commandrunner v0.12.0 + code.cloudfoundry.org/commandrunner v0.13.0 code.cloudfoundry.org/idmapper v0.0.0-20241015133504-7f68486a3ae9 code.cloudfoundry.org/lager/v3 v3.10.0 github.com/cloudfoundry/dropsonde v1.1.0 - github.com/cloudfoundry/sonde-go v0.0.0-20241007161526-e3ce7aa1aabc + github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/containers/image/v5 v5.32.2 github.com/containers/storage v1.55.0 github.com/docker/distribution v2.8.3+incompatible
-------- index 3fb0653..8a4a1c1 100644 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/containers/image/v5 v5.32.2 - github.com/containers/storage v1.55.0 + github.com/containers/storage v1.55.1 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-units v0.5.0
-------- index 8a4a1c1..c19cdc1 100644 @@ -6,7 +6,7 @@ toolchain go1.22.3 code.cloudfoundry.org/commandrunner v0.13.0 - code.cloudfoundry.org/idmapper v0.0.0-20241015133504-7f68486a3ae9 + code.cloudfoundry.org/idmapper v0.0.0-20241018133107-638ac24af7b7 code.cloudfoundry.org/lager/v3 v3.10.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908
-------- index c19cdc1..65d4246 100644 @@ -5,9 +5,9 @@ go 1.22.0 toolchain go1.22.3 - code.cloudfoundry.org/commandrunner v0.13.0 + code.cloudfoundry.org/commandrunner v0.14.0 code.cloudfoundry.org/idmapper v0.0.0-20241018133107-638ac24af7b7 - code.cloudfoundry.org/lager/v3 v3.10.0 + code.cloudfoundry.org/lager/v3 v3.11.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/containers/image/v5 v5.32.2
-------- index 65d4246..f3d7333 100644 @@ -6,7 +6,7 @@ toolchain go1.22.3 code.cloudfoundry.org/commandrunner v0.14.0 - code.cloudfoundry.org/idmapper v0.0.0-20241018133107-638ac24af7b7 + code.cloudfoundry.org/idmapper v0.0.0-20241023020545-f7c358bd5b15 code.cloudfoundry.org/lager/v3 v3.11.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908
-------- index f3d7333..956b073 100644 @@ -5,9 +5,9 @@ go 1.22.0 toolchain go1.22.3 - code.cloudfoundry.org/commandrunner v0.14.0 - code.cloudfoundry.org/idmapper v0.0.0-20241023020545-f7c358bd5b15 - code.cloudfoundry.org/lager/v3 v3.11.0 + code.cloudfoundry.org/commandrunner v0.15.0 + code.cloudfoundry.org/idmapper v0.0.0-20241028203643-63d4530b057b + code.cloudfoundry.org/lager/v3 v3.13.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/containers/image/v5 v5.32.2
-------- index 956b073..214453b 100644 @@ -5,8 +5,8 @@ go 1.22.0 toolchain go1.22.3 - code.cloudfoundry.org/commandrunner v0.15.0 - code.cloudfoundry.org/idmapper v0.0.0-20241028203643-63d4530b057b + code.cloudfoundry.org/commandrunner v0.16.0 + code.cloudfoundry.org/idmapper v0.0.0-20241029172545-2bf8582b8e41 code.cloudfoundry.org/lager/v3 v3.13.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-units v0.5.0 - github.com/onsi/ginkgo/v2 v2.20.2 - github.com/onsi/gomega v1.34.2 + github.com/onsi/ginkgo/v2 v2.21.0 + github.com/onsi/gomega v1.35.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 github.com/opencontainers/runtime-spec v1.2.0
…tem sizes, + uid/gids
resolve integer overflow issues where applicable/feasible for filesystem sizes, + uid/gids
-------- index 214453b..4bd16fc 100644 @@ -5,9 +5,9 @@ go 1.22.0 toolchain go1.22.3 - code.cloudfoundry.org/commandrunner v0.16.0 - code.cloudfoundry.org/idmapper v0.0.0-20241029172545-2bf8582b8e41 - code.cloudfoundry.org/lager/v3 v3.13.0 + code.cloudfoundry.org/commandrunner v0.17.0 + code.cloudfoundry.org/idmapper v0.0.0-20241030020633-27d1aaa8ad6f + code.cloudfoundry.org/lager/v3 v3.14.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/containers/image/v5 v5.32.2 github.com/docker/docker v27.3.1+incompatible github.com/docker/go-units v0.5.0 github.com/onsi/ginkgo/v2 v2.21.0 - github.com/onsi/gomega v1.35.0 + github.com/onsi/gomega v1.35.1 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 github.com/opencontainers/runtime-spec v1.2.0
Mark int overflow warnings as false positives for gosec
-------- index 4bd16fc..f51f637 100644 @@ -6,7 +6,7 @@ toolchain go1.22.3 code.cloudfoundry.org/commandrunner v0.17.0 - code.cloudfoundry.org/idmapper v0.0.0-20241030020633-27d1aaa8ad6f + code.cloudfoundry.org/idmapper v0.0.0-20241106173217-8c02320d401f code.cloudfoundry.org/lager/v3 v3.14.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908
Update casting for a guardian g115 fix
--------
-------- index f51f637..4030de1 100644 @@ -1,17 +1,17 @@ module code.cloudfoundry.org/grootfs -go 1.22.0 +go 1.22.6 -toolchain go1.22.3 +toolchain go1.23.3 - code.cloudfoundry.org/commandrunner v0.17.0 - code.cloudfoundry.org/idmapper v0.0.0-20241106173217-8c02320d401f - code.cloudfoundry.org/lager/v3 v3.14.0 + code.cloudfoundry.org/commandrunner v0.18.0 + code.cloudfoundry.org/idmapper v0.0.0-20241107162109-4deb42ee1274 + code.cloudfoundry.org/lager/v3 v3.15.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 - github.com/containers/image/v5 v5.32.2 - github.com/containers/storage v1.55.1 + github.com/containers/image/v5 v5.33.0 + github.com/containers/storage v1.56.0 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-units v0.5.0 github.com/sirupsen/logrus v1.9.3 github.com/urfave/cli/v2 v2.27.5 github.com/ventu-io/go-shortid v0.0.0-20201117134242-e59966efd125 - golang.org/x/sys v0.26.0 + golang.org/x/sys v0.27.0 google.golang.org/protobuf v1.35.1 gopkg.in/yaml.v2 v2.4.0
-------- index 4030de1..9b6e1a7 100644 @@ -6,7 +6,7 @@ toolchain go1.23.3 code.cloudfoundry.org/commandrunner v0.18.0 - code.cloudfoundry.org/idmapper v0.0.0-20241107162109-4deb42ee1274 + code.cloudfoundry.org/idmapper v0.0.0-20241113020911-1cb6a76827ab code.cloudfoundry.org/lager/v3 v3.15.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/urfave/cli/v2 v2.27.5 github.com/ventu-io/go-shortid v0.0.0-20201117134242-e59966efd125 golang.org/x/sys v0.27.0 - google.golang.org/protobuf v1.35.1 + google.golang.org/protobuf v1.35.2 gopkg.in/yaml.v2 v2.4.0
-------- index 9b6e1a7..b1872a6 100644 @@ -5,9 +5,9 @@ go 1.22.6 toolchain go1.23.3 - code.cloudfoundry.org/commandrunner v0.18.0 + code.cloudfoundry.org/commandrunner v0.19.0 code.cloudfoundry.org/idmapper v0.0.0-20241113020911-1cb6a76827ab - code.cloudfoundry.org/lager/v3 v3.15.0 + code.cloudfoundry.org/lager/v3 v3.16.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20241016180203-3c0e1c24e908 github.com/containers/image/v5 v5.33.0 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-units v0.5.0 - github.com/onsi/ginkgo/v2 v2.21.0 - github.com/onsi/gomega v1.35.1 + github.com/onsi/ginkgo/v2 v2.22.0 + github.com/onsi/gomega v1.36.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 github.com/opencontainers/runtime-spec v1.2.0
- Also remove files that are no longer needed
-------- index b3a1562..6f450e6 100644 @@ -4,7 +4,7 @@ go 1.25.0 code.cloudfoundry.org/commandrunner v0.66.0 - code.cloudfoundry.org/idmapper v0.0.0-20260610151154-d7788493358e + code.cloudfoundry.org/idmapper v0.0.0-20260612143105-3ca30fce615d code.cloudfoundry.org/lager/v3 v3.73.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20260526083715-66f310f13c26 github.com/docker/docker v28.5.2+incompatible github.com/docker/go-units v0.5.0 github.com/klauspost/compress v1.18.6 - github.com/onsi/ginkgo/v2 v2.29.0 + github.com/onsi/ginkgo/v2 v2.30.0 github.com/onsi/gomega v1.41.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1
-------- index 6f450e6..70238a3 100644 github.com/docker/docker v28.5.2+incompatible github.com/docker/go-units v0.5.0 github.com/klauspost/compress v1.18.6 - github.com/onsi/ginkgo/v2 v2.30.0 - github.com/onsi/gomega v1.41.0 + github.com/onsi/ginkgo/v2 v2.31.0 + github.com/onsi/gomega v1.42.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 github.com/opencontainers/runtime-spec v1.3.0
-------- index 70238a3..9cb996c 100644 @@ -4,8 +4,8 @@ go 1.25.0 code.cloudfoundry.org/commandrunner v0.66.0 - code.cloudfoundry.org/idmapper v0.0.0-20260612143105-3ca30fce615d - code.cloudfoundry.org/lager/v3 v3.73.0 + code.cloudfoundry.org/idmapper v0.0.0-20260615182721-a3778a6bc53e + code.cloudfoundry.org/lager/v3 v3.74.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20260526083715-66f310f13c26 github.com/containers/image/v5 v5.36.2
-------- index 9cb996c..bc2f13d 100644 @@ -3,19 +3,19 @@ module code.cloudfoundry.org/grootfs go 1.25.0 - code.cloudfoundry.org/commandrunner v0.66.0 - code.cloudfoundry.org/idmapper v0.0.0-20260615182721-a3778a6bc53e - code.cloudfoundry.org/lager/v3 v3.74.0 + code.cloudfoundry.org/commandrunner v0.67.0 + code.cloudfoundry.org/idmapper v0.0.0-20260624020507-8356a773bc50 + code.cloudfoundry.org/lager/v3 v3.75.0 github.com/cloudfoundry/dropsonde v1.1.0 - github.com/cloudfoundry/sonde-go v0.0.0-20260526083715-66f310f13c26 + github.com/cloudfoundry/sonde-go v0.0.0-20260622134720-d7b012c5b9c4 github.com/containers/image/v5 v5.36.2 github.com/containers/storage v1.59.1 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v28.5.2+incompatible github.com/docker/go-units v0.5.0 github.com/klauspost/compress v1.18.6 - github.com/onsi/ginkgo/v2 v2.31.0 - github.com/onsi/gomega v1.42.0 + github.com/onsi/ginkgo/v2 v2.32.0 + github.com/onsi/gomega v1.42.1 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 github.com/opencontainers/runtime-spec v1.3.0
-------- index bc2f13d..1711726 100644 @@ -3,9 +3,9 @@ module code.cloudfoundry.org/grootfs go 1.25.0 - code.cloudfoundry.org/commandrunner v0.67.0 - code.cloudfoundry.org/idmapper v0.0.0-20260624020507-8356a773bc50 - code.cloudfoundry.org/lager/v3 v3.75.0 + code.cloudfoundry.org/commandrunner v0.69.0 + code.cloudfoundry.org/idmapper v0.0.0-20260701020614-012edacff91d + code.cloudfoundry.org/lager/v3 v3.76.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20260622134720-d7b012c5b9c4 github.com/containers/image/v5 v5.36.2 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v28.5.2+incompatible github.com/docker/go-units v0.5.0 - github.com/klauspost/compress v1.18.6 + github.com/klauspost/compress v1.18.7 github.com/onsi/ginkgo/v2 v2.32.0 github.com/onsi/gomega v1.42.1 github.com/opencontainers/go-digest v1.0.0
-------- index 1711726..a04a0db 100644 @@ -5,15 +5,15 @@ go 1.25.0 code.cloudfoundry.org/commandrunner v0.69.0 code.cloudfoundry.org/idmapper v0.0.0-20260701020614-012edacff91d - code.cloudfoundry.org/lager/v3 v3.76.0 + code.cloudfoundry.org/lager/v3 v3.77.0 github.com/cloudfoundry/dropsonde v1.1.0 - github.com/cloudfoundry/sonde-go v0.0.0-20260622134720-d7b012c5b9c4 + github.com/cloudfoundry/sonde-go v0.0.0-20260706112804-cd2c61a47573 github.com/containers/image/v5 v5.36.2 github.com/containers/storage v1.59.1 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v28.5.2+incompatible github.com/docker/go-units v0.5.0 - github.com/klauspost/compress v1.18.7 + github.com/klauspost/compress v1.19.0 github.com/onsi/ginkgo/v2 v2.32.0 github.com/onsi/gomega v1.42.1 github.com/opencontainers/go-digest v1.0.0
-------- index a04a0db..2bd3953 100644 @@ -3,9 +3,9 @@ module code.cloudfoundry.org/grootfs go 1.25.0 - code.cloudfoundry.org/commandrunner v0.69.0 - code.cloudfoundry.org/idmapper v0.0.0-20260701020614-012edacff91d - code.cloudfoundry.org/lager/v3 v3.77.0 + code.cloudfoundry.org/commandrunner v0.71.0 + code.cloudfoundry.org/idmapper v0.0.0-20260715020852-f58f350c17b3 + code.cloudfoundry.org/lager/v3 v3.78.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20260706112804-cd2c61a47573 github.com/containers/image/v5 v5.36.2 github.com/sirupsen/logrus v1.9.4 github.com/urfave/cli/v2 v2.27.7 github.com/ventu-io/go-shortid v0.0.0-20201117134242-e59966efd125 - golang.org/x/sys v0.46.0 + golang.org/x/sys v0.47.0 google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v2 v2.4.0
-------- index 2bd3953..44cb382 100644 @@ -3,17 +3,17 @@ module code.cloudfoundry.org/grootfs go 1.25.0 - code.cloudfoundry.org/commandrunner v0.71.0 - code.cloudfoundry.org/idmapper v0.0.0-20260715020852-f58f350c17b3 - code.cloudfoundry.org/lager/v3 v3.78.0 + code.cloudfoundry.org/commandrunner v0.72.0 + code.cloudfoundry.org/idmapper v0.0.0-20260722021010-9c84232f2761 + code.cloudfoundry.org/lager/v3 v3.79.0 github.com/cloudfoundry/dropsonde v1.1.0 - github.com/cloudfoundry/sonde-go v0.0.0-20260706112804-cd2c61a47573 + github.com/cloudfoundry/sonde-go v0.0.0-20260720065356-6728909ed72b github.com/containers/image/v5 v5.36.2 github.com/containers/storage v1.59.1 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v28.5.2+incompatible github.com/docker/go-units v0.5.0 - github.com/klauspost/compress v1.19.0 + github.com/klauspost/compress v1.19.1 github.com/onsi/ginkgo/v2 v2.32.0 github.com/onsi/gomega v1.42.1 github.com/opencontainers/go-digest v1.0.0
-------- index 44cb382..ff848e6 100644 @@ -5,7 +5,7 @@ go 1.25.0 code.cloudfoundry.org/commandrunner v0.72.0 code.cloudfoundry.org/idmapper v0.0.0-20260722021010-9c84232f2761 - code.cloudfoundry.org/lager/v3 v3.79.0 + code.cloudfoundry.org/lager/v3 v3.80.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20260720065356-6728909ed72b github.com/containers/image/v5 v5.36.2
- Remove replace directives for grootfs, idmapper, and garden (garden now fetched from code.cloudfoundry.org/garden vanity URL) - Move full source trees of grootfs and idmapper under grootfs/ and idmapper/ subdirectories (CI/vendor/go.mod removed — they are now part of guardian's module) - Rewrite all import paths: code.cloudfoundry.org/grootfs/ → code.cloudfoundry.org/guardian/grootfs/ code.cloudfoundry.org/idmapper → code.cloudfoundry.org/guardian/idmapper - Add grootfs's direct dependencies to guardian's go.mod and vendor/ (containers/image, containers/storage, docker/*, gorilla/mux, ventu-io/go-shortid, gopkg.in/yaml.v3, and their transitive deps) - git history from the grootfs and idmapper repos is preserved in full via git merge --allow-unrelated-histories Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
go mod vendor only copies directories that contain imported Go packages. Adding these stub files allows consumers to import these packages and have the C sources and Makefile vendored automatically. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR will remove the need to have grootfs and idmapper as seperate repositories. It's now merged into guardian as a single standalone repo. The reason we are doing this is because we would like to remove the submodules from garden-runc-release. This module can now just be imported like any other go projects.
Backward Compatibility
Breaking Change? No