From bb6a83887612d89365a24b213dabf344ffadece1 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 20 Jan 2022 19:40:52 -0800 Subject: [PATCH] libct: initContainer: rename Id -> ID Since the next commit is going to touch this structure, our CI (lint-extra) is about to complain about improperly named field: > Warning: var-naming: struct field ContainerId should be ContainerID (revive) Make it happy. Brought to use by gopls rename. Signed-off-by: Kir Kolyshkin --- libcontainer/container_linux.go | 2 +- libcontainer/init_linux.go | 2 +- libcontainer/process_linux.go | 2 +- libcontainer/setns_init_linux.go | 2 +- libcontainer/standard_init_linux.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go index f6877b742..261f5a9f4 100644 --- a/libcontainer/container_linux.go +++ b/libcontainer/container_linux.go @@ -665,7 +665,7 @@ func (c *linuxContainer) newInitConfig(process *Process) *initConfig { Cwd: process.Cwd, Capabilities: process.Capabilities, PassedFilesCount: len(process.ExtraFiles), - ContainerId: c.ID(), + ContainerID: c.ID(), NoNewPrivileges: c.config.NoNewPrivileges, RootlessEUID: c.config.RootlessEUID, RootlessCgroups: c.config.RootlessCgroups, diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index 1e5c394c3..0734f42a0 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -60,7 +60,7 @@ type initConfig struct { Config *configs.Config `json:"config"` Networks []*network `json:"network"` PassedFilesCount int `json:"passed_files_count"` - ContainerId string `json:"containerid"` + ContainerID string `json:"containerid"` Rlimits []configs.Rlimit `json:"rlimits"` CreateConsole bool `json:"create_console"` ConsoleWidth uint16 `json:"console_width"` diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go index e025445d3..97f28a1ab 100644 --- a/libcontainer/process_linux.go +++ b/libcontainer/process_linux.go @@ -192,7 +192,7 @@ func (p *setnsProcess) start() (retErr error) { Metadata: p.config.Config.Seccomp.ListenerMetadata, State: specs.State{ Version: specs.Version, - ID: p.config.ContainerId, + ID: p.config.ContainerID, Status: specs.StateRunning, Pid: p.initProcessPid, Bundle: bundle, diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go index 09ab552b3..da31110ae 100644 --- a/libcontainer/setns_init_linux.go +++ b/libcontainer/setns_init_linux.go @@ -26,7 +26,7 @@ type linuxSetnsInit struct { } func (l *linuxSetnsInit) getSessionRingName() string { - return "_ses." + l.config.ContainerId + return "_ses." + l.config.ContainerID } func (l *linuxSetnsInit) Init() error { diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go index 585a04fa0..1a9c4979c 100644 --- a/libcontainer/standard_init_linux.go +++ b/libcontainer/standard_init_linux.go @@ -42,7 +42,7 @@ func (l *linuxStandardInit) getSessionRingParams() (string, uint32, uint32) { // Create a unique per session container name that we can join in setns; // However, other containers can also join it. - return "_ses." + l.config.ContainerId, 0xffffffff, newperms + return "_ses." + l.config.ContainerID, 0xffffffff, newperms } func (l *linuxStandardInit) Init() error {