From 5321ed2edb6f6cc09dd67cc18827f4f69e80a91d Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 28 Jun 2021 21:20:27 -0700 Subject: [PATCH 1/4] libct/capabilities: internalize The package has no external users (at least according to https://pkg.go.dev/github.com/opencontainers/runc/libcontainer/capabilities?tab=importedby) and thus is a good candidate for internalization. Signed-off-by: Kir Kolyshkin --- {libcontainer => internal}/capabilities/capabilities.go | 0 .../capabilities/capabilities_linux_test.go | 0 .../capabilities/capabilities_unsupported.go | 0 libcontainer/init_linux.go | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename {libcontainer => internal}/capabilities/capabilities.go (100%) rename {libcontainer => internal}/capabilities/capabilities_linux_test.go (100%) rename {libcontainer => internal}/capabilities/capabilities_unsupported.go (100%) diff --git a/libcontainer/capabilities/capabilities.go b/internal/capabilities/capabilities.go similarity index 100% rename from libcontainer/capabilities/capabilities.go rename to internal/capabilities/capabilities.go diff --git a/libcontainer/capabilities/capabilities_linux_test.go b/internal/capabilities/capabilities_linux_test.go similarity index 100% rename from libcontainer/capabilities/capabilities_linux_test.go rename to internal/capabilities/capabilities_linux_test.go diff --git a/libcontainer/capabilities/capabilities_unsupported.go b/internal/capabilities/capabilities_unsupported.go similarity index 100% rename from libcontainer/capabilities/capabilities_unsupported.go rename to internal/capabilities/capabilities_unsupported.go diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index 985c9250403..288e3d446c7 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -20,7 +20,7 @@ import ( "github.com/vishvananda/netlink" "golang.org/x/sys/unix" - "github.com/opencontainers/runc/libcontainer/capabilities" + "github.com/opencontainers/runc/internal/capabilities" "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/system" From 5e295a5e7db672e7fccf8ebfaf528a02d8cdb53f Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 28 Jun 2021 21:34:58 -0700 Subject: [PATCH 2/4] libc/keys: internalize Signed-off-by: Kir Kolyshkin --- {libcontainer => internal}/keys/keyctl.go | 0 libcontainer/setns_init_linux.go | 2 +- libcontainer/standard_init_linux.go | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {libcontainer => internal}/keys/keyctl.go (100%) diff --git a/libcontainer/keys/keyctl.go b/internal/keys/keyctl.go similarity index 100% rename from libcontainer/keys/keyctl.go rename to internal/keys/keyctl.go diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go index 89b5609a6b6..ca10ad3f0d6 100644 --- a/libcontainer/setns_init_linux.go +++ b/libcontainer/setns_init_linux.go @@ -13,8 +13,8 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sys/unix" + "github.com/opencontainers/runc/internal/keys" "github.com/opencontainers/runc/libcontainer/apparmor" - "github.com/opencontainers/runc/libcontainer/keys" "github.com/opencontainers/runc/libcontainer/seccomp" "github.com/opencontainers/runc/libcontainer/system" ) diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go index 89a7d00961a..1dd7cd21906 100644 --- a/libcontainer/standard_init_linux.go +++ b/libcontainer/standard_init_linux.go @@ -15,9 +15,9 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sys/unix" + "github.com/opencontainers/runc/internal/keys" "github.com/opencontainers/runc/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/configs" - "github.com/opencontainers/runc/libcontainer/keys" "github.com/opencontainers/runc/libcontainer/seccomp" "github.com/opencontainers/runc/libcontainer/system" ) From a49e7d419484d491434fde2a8d93cfbc862b68d1 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 28 Jun 2021 21:36:41 -0700 Subject: [PATCH 3/4] libct/logs: internalize Signed-off-by: Kir Kolyshkin --- init.go | 2 +- {libcontainer => internal}/logs/logs.go | 0 {libcontainer => internal}/logs/logs_linux_test.go | 0 libcontainer/process_linux.go | 2 +- main.go | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename {libcontainer => internal}/logs/logs.go (100%) rename {libcontainer => internal}/logs/logs_linux_test.go (100%) diff --git a/init.go b/init.go index 59ce1e8c739..1b80c6044a4 100644 --- a/init.go +++ b/init.go @@ -6,8 +6,8 @@ import ( "runtime" "strconv" + "github.com/opencontainers/runc/internal/logs" "github.com/opencontainers/runc/libcontainer" - "github.com/opencontainers/runc/libcontainer/logs" _ "github.com/opencontainers/runc/libcontainer/nsenter" "github.com/sirupsen/logrus" "github.com/urfave/cli" diff --git a/libcontainer/logs/logs.go b/internal/logs/logs.go similarity index 100% rename from libcontainer/logs/logs.go rename to internal/logs/logs.go diff --git a/libcontainer/logs/logs_linux_test.go b/internal/logs/logs_linux_test.go similarity index 100% rename from libcontainer/logs/logs_linux_test.go rename to internal/logs/logs_linux_test.go diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go index 490a7c8d702..5f38527ebf0 100644 --- a/libcontainer/process_linux.go +++ b/libcontainer/process_linux.go @@ -13,11 +13,11 @@ import ( "strconv" "time" + "github.com/opencontainers/runc/internal/logs" "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups/fs2" "github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/intelrdt" - "github.com/opencontainers/runc/libcontainer/logs" "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/runc/libcontainer/utils" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/main.go b/main.go index 45652ab327d..2d3bd663313 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/opencontainers/runc/libcontainer/logs" + "github.com/opencontainers/runc/internal/logs" "github.com/opencontainers/runc/libcontainer/seccomp" "github.com/opencontainers/runtime-spec/specs-go" From 8380b983ad6d788e67f51d57b2ff8b73b630df9b Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 1 Jul 2021 10:04:31 -0700 Subject: [PATCH 4/4] libct/configs/validate: internalize Signed-off-by: Kir Kolyshkin --- {libcontainer => internal}/configs/validate/rootless.go | 0 .../configs/validate/rootless_test.go | 0 {libcontainer => internal}/configs/validate/validator.go | 0 .../configs/validate/validator_test.go | 2 +- libcontainer/factory_linux.go | 2 +- libcontainer/specconv/spec_linux_test.go | 7 ++++--- 6 files changed, 6 insertions(+), 5 deletions(-) rename {libcontainer => internal}/configs/validate/rootless.go (100%) rename {libcontainer => internal}/configs/validate/rootless_test.go (100%) rename {libcontainer => internal}/configs/validate/validator.go (100%) rename {libcontainer => internal}/configs/validate/validator_test.go (99%) diff --git a/libcontainer/configs/validate/rootless.go b/internal/configs/validate/rootless.go similarity index 100% rename from libcontainer/configs/validate/rootless.go rename to internal/configs/validate/rootless.go diff --git a/libcontainer/configs/validate/rootless_test.go b/internal/configs/validate/rootless_test.go similarity index 100% rename from libcontainer/configs/validate/rootless_test.go rename to internal/configs/validate/rootless_test.go diff --git a/libcontainer/configs/validate/validator.go b/internal/configs/validate/validator.go similarity index 100% rename from libcontainer/configs/validate/validator.go rename to internal/configs/validate/validator.go diff --git a/libcontainer/configs/validate/validator_test.go b/internal/configs/validate/validator_test.go similarity index 99% rename from libcontainer/configs/validate/validator_test.go rename to internal/configs/validate/validator_test.go index 687ce1b09a4..d3865b8e9c5 100644 --- a/libcontainer/configs/validate/validator_test.go +++ b/internal/configs/validate/validator_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" + "github.com/opencontainers/runc/internal/configs/validate" "github.com/opencontainers/runc/libcontainer/configs" - "github.com/opencontainers/runc/libcontainer/configs/validate" "golang.org/x/sys/unix" ) diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go index 63cf57b099b..6ef82ac7db3 100644 --- a/libcontainer/factory_linux.go +++ b/libcontainer/factory_linux.go @@ -16,12 +16,12 @@ import ( "github.com/moby/sys/mountinfo" "golang.org/x/sys/unix" + "github.com/opencontainers/runc/internal/configs/validate" "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups/fs" "github.com/opencontainers/runc/libcontainer/cgroups/fs2" "github.com/opencontainers/runc/libcontainer/cgroups/systemd" "github.com/opencontainers/runc/libcontainer/configs" - "github.com/opencontainers/runc/libcontainer/configs/validate" "github.com/opencontainers/runc/libcontainer/intelrdt" "github.com/opencontainers/runc/libcontainer/utils" ) diff --git a/libcontainer/specconv/spec_linux_test.go b/libcontainer/specconv/spec_linux_test.go index 316a21e8747..a839e87be00 100644 --- a/libcontainer/specconv/spec_linux_test.go +++ b/libcontainer/specconv/spec_linux_test.go @@ -8,11 +8,12 @@ import ( "testing" dbus "github.com/godbus/dbus/v5" - "github.com/opencontainers/runc/libcontainer/configs" - "github.com/opencontainers/runc/libcontainer/configs/validate" - "github.com/opencontainers/runc/libcontainer/devices" "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" + + "github.com/opencontainers/runc/internal/configs/validate" + "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/devices" ) func TestCreateCommandHookTimeout(t *testing.T) {