erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-09-14 03:27:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

run go fix ./...

Browse source 
Plus manually deleting the left over inline functions because go fix
doesn't do that even though they are private functions.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2026-09-03 18:50:07 +02:00
parent 2e49c22bc2
commit eb96a9d5b8
No known key found for this signature in database
GPG key ID: EB145DD938A3CAF2
13 changed files with 58 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/podman/networks/create_test.go
View file

@ -34,7 +34,7 @@ func TestParseRoute(t *testing.T) {
want: &types.Route{
Destination: mustParseCIDR(t, "10.21.0.0/24"),
Gateway: net.ParseIP("10.19.12.250"),
Metric: uint32Ptr(100),
Metric: new(uint32(100)),
RouteType: types.RouteTypeUnicast,
},
},
@ -53,7 +53,7 @@ func TestParseRoute(t *testing.T) {
routeStr: "10.21.0.0/24,blackhole,200",
want: &types.Route{
Destination: mustParseCIDR(t, "10.21.0.0/24"),
Metric: uint32Ptr(200),
Metric: new(uint32(200)),
RouteType: types.RouteTypeBlackhole,
},
},
@ -71,7 +71,7 @@ func TestParseRoute(t *testing.T) {
routeStr: "192.168.100.0/24,unreachable,150",
want: &types.Route{
Destination: mustParseCIDR(t, "192.168.100.0/24"),
Metric: uint32Ptr(150),
Metric: new(uint32(150)),
RouteType: types.RouteTypeUnreachable,
},
},
@ -89,7 +89,7 @@ func TestParseRoute(t *testing.T) {
routeStr: "172.16.0.0/16,prohibit,50",
want: &types.Route{
Destination: mustParseCIDR(t, "172.16.0.0/16"),
Metric: uint32Ptr(50),
Metric: new(uint32(50)),
RouteType: types.RouteTypeProhibit,
},
},
@ -216,7 +216,3 @@ func mustParseCIDR(t *testing.T, cidr string) types.IPNet {
require.NoError(t, err)
return ipnet
}
func uint32Ptr(v uint32) *uint32 {
return &v
}

14
pkg/bindings/internal/util/util_test.go
View file

@ -11,10 +11,6 @@ import (
"go.podman.io/podman/v6/pkg/bindings/internal/util"
)
func strp(s string) *string { return &s }
func intp(i int) *int { return &i }
func boolp(b bool) *bool { return &b }
type changedOptions struct {
Set *string
Unset *string
@ -107,9 +103,9 @@ func TestToParamsUnsetFieldsAreSkipped(t *testing.T) {
func TestToParamsSimpleFields(t *testing.T) {
params, err := util.ToParams(&toParamsOptions{
Name: strp("foo"),
Count: intp(5),
Enabled: boolp(true),
Name: new("foo"),
Count: new(5),
Enabled: new(true),
})
require.NoError(t, err)
assert.Equal(t, "foo", params.Get("name"))
@ -146,8 +142,8 @@ func TestToParamsEmptyMap(t *testing.T) {
func TestToParamsSchemaTag(t *testing.T) {
params, err := util.ToParams(&toParamsOptions{
Renamed: strp("here"),
Skipped: strp("gone"),
Renamed: new("here"),
Skipped: new("gone"),
})
require.NoError(t, err)
// "custom_name" (the schema rename) must be the only key: the field name

4
pkg/criu/criu_linux.go
View file

@ -7,8 +7,6 @@ import (
"github.com/checkpoint-restore/go-criu/v8"
"github.com/checkpoint-restore/go-criu/v8/rpc"
"google.golang.org/protobuf/proto"
)
// CheckForCriu uses CRIU's go bindings to check if the CRIU
@ -29,7 +27,7 @@ func CheckForCriu(version int) error {
func MemTrack() bool {
features, err := criu.MakeCriu().FeatureCheck(
&rpc.CriuFeatures{
MemTrack: proto.Bool(true),
MemTrack: new(true),
},
)
if err != nil {

4
pkg/machine/e2e/config_start_test.go
View file

@ -45,7 +45,3 @@ func (s *startMachine) withUpdateConnection(value *bool) *startMachine {
s.updateConnection = value
return s
}
func ptrBool(v bool) *bool {
return &v
}

2
pkg/machine/e2e/rm_test.go
View file

@ -146,7 +146,7 @@ var _ = Describe("podman machine rm", func() {
barName := "bar"
bar := new(initMachine)
session, err = mb.setName(barName).setCmd(bar.withUpdateConnection(ptrBool(false)).withImage(mb.imagePath).withNow()).run()
session, err = mb.setName(barName).setCmd(bar.withUpdateConnection(new(false)).withImage(mb.imagePath).withNow()).run()
Expect(err).ToNot(HaveOccurred())
Expect(session).To(Exit(0))

2
pkg/machine/e2e/ssh_test.go
View file

@ -39,7 +39,7 @@ var _ = Describe("podman machine ssh", func() {
name := "podman-machine-default"
i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow().withUpdateConnection(ptrBool(true))).run()
session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow().withUpdateConnection(new(true))).run()
Expect(err).ToNot(HaveOccurred())
Expect(session).To(Exit(0))

12
pkg/machine/e2e/start_test.go
View file

@ -196,7 +196,7 @@ var _ = Describe("podman machine start", func() {
defer GinkgoRecover()
defer wg.Done()
s := &startMachine{}
startSession1, err = mb.setName(machine1).setCmd(s.withUpdateConnection(ptrBool(false))).setTimeout(time.Minute * 10).run()
startSession1, err = mb.setName(machine1).setCmd(s.withUpdateConnection(new(false))).setTimeout(time.Minute * 10).run()
Expect(err).ToNot(HaveOccurred())
}()
go func() {
@ -209,7 +209,7 @@ var _ = Describe("podman machine start", func() {
// second run.
nmb, err := newMB()
Expect(err).ToNot(HaveOccurred())
startSession2, err = nmb.setName(machine2).setCmd(s.withUpdateConnection(ptrBool(false))).setTimeout(time.Minute * 10).run()
startSession2, err = nmb.setName(machine2).setCmd(s.withUpdateConnection(new(false))).setTimeout(time.Minute * 10).run()
Expect(err).ToNot(HaveOccurred())
}()
wg.Wait()
@ -250,7 +250,7 @@ var _ = Describe("podman machine start", func() {
// Start the new machine with --update-connection=false
s := startMachine{}
startSession, err := mb.setName(machineName).setCmd(s.withUpdateConnection(ptrBool(false))).run()
startSession, err := mb.setName(machineName).setCmd(s.withUpdateConnection(new(false))).run()
Expect(err).ToNot(HaveOccurred())
Expect(startSession).To(Exit(0))
@ -266,7 +266,7 @@ var _ = Describe("podman machine start", func() {
Expect(stopSession).To(Exit(0))
// Start the new machine with --update-connection
startSession, err = mb.setName(machineName).setCmd(s.withUpdateConnection(ptrBool(true))).run()
startSession, err = mb.setName(machineName).setCmd(s.withUpdateConnection(new(true))).run()
Expect(err).ToNot(HaveOccurred())
Expect(startSession).To(Exit(0))
@ -288,7 +288,7 @@ var _ = Describe("podman machine start", func() {
// Create a new machine
i := initMachine{}
machineName1 := randomString()
initSession, err := mb.setName(machineName1).setCmd(i.withImage(mb.imagePath).withUpdateConnection(ptrBool(false)).withNow()).run()
initSession, err := mb.setName(machineName1).setCmd(i.withImage(mb.imagePath).withUpdateConnection(new(false)).withNow()).run()
Expect(err).ToNot(HaveOccurred())
Expect(initSession).To(Exit(0))
@ -305,7 +305,7 @@ var _ = Describe("podman machine start", func() {
// Create another machine
machineName2 := randomString()
initSession2, err := mb.setName(machineName2).setCmd(i.withImage(mb.imagePath).withUpdateConnection(ptrBool(true)).withNow()).run()
initSession2, err := mb.setName(machineName2).setCmd(i.withImage(mb.imagePath).withUpdateConnection(new(true)).withNow()).run()
Expect(err).ToNot(HaveOccurred())
Expect(initSession2).To(Exit(0))

6
pkg/machine/hyperv/stubber.go
View file

@ -161,8 +161,8 @@ func (h HyperVStubber) CreateVM(_ define.CreateVMOpts, mc *vmconfigs.MachineConf
}
builder.WithUnit(ignition.Unit{
Contents: ignition.StrToPtr(netUnitFile),
Enabled: ignition.BoolToPtr(true),
Contents: new(netUnitFile),
Enabled: new(true),
Name: "vsock-network.service",
})
@ -175,7 +175,7 @@ func (h HyperVStubber) CreateVM(_ define.CreateVMOpts, mc *vmconfigs.MachineConf
Contents: ignition.Resource{
Source: ignition.EncodeDataURLPtr(hyperVVsockNMConnection),
},
Mode: ignition.IntToPtr(0o600),
Mode: new(0o600),
},
})

61
pkg/machine/ignition/ignition.go
View file

@ -29,21 +29,6 @@ const (
DefaultIgnitionUserName = "core"
)
// Convenience function to convert int to ptr
func IntToPtr(i int) *int {
return &i
}
// Convenience function to convert string to ptr
func StrToPtr(s string) *string {
return &s
}
// Convenience function to convert bool to ptr
func BoolToPtr(b bool) *bool {
return &b
}
func GetNodeUsr(usrName string) NodeUser {
return NodeUser{Name: &usrName}
}
@ -85,7 +70,7 @@ func (ign *DynamicIgnition) getUsers() []PasswdUser {
if !isCoreUser {
coreUser := PasswdUser{
Name: DefaultIgnitionUserName,
ShouldExist: BoolToPtr(false),
ShouldExist: new(false),
}
users = append(users, coreUser)
}
@ -94,7 +79,7 @@ func (ign *DynamicIgnition) getUsers() []PasswdUser {
user := PasswdUser{
Name: ign.Name,
SSHAuthorizedKeys: []SSHAuthorizedKey{SSHAuthorizedKey(ign.Key)},
UID: IntToPtr(ign.UID),
UID: new(ign.UID),
}
// If we are not using the core user, we need to make the user part
@ -162,11 +147,11 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
Node: Node{
Group: GetNodeGrp("root"),
Path: "/etc/localtime",
Overwrite: BoolToPtr(false),
Overwrite: new(false),
User: GetNodeUsr("root"),
},
LinkEmbedded1: LinkEmbedded1{
Hard: BoolToPtr(false),
Hard: new(false),
// We always want this value in unix form (../usr/share/zoneinfo) because this is being
// set in the machine OS (always Linux) and systemd needs the relative symlink. However,
// filepath.join on windows will use a "\\" separator so use path.Join() which always
@ -181,7 +166,7 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
ignSystemd := Systemd{
Units: []Unit{
{
Enabled: BoolToPtr(true),
Enabled: new(true),
Name: "podman.socket",
},
{
@ -189,7 +174,7 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
// updates given a certain configuration
// Disable auto-updating of fcos images
// https://github.com/containers/podman/issues/20122
Enabled: BoolToPtr(false),
Enabled: new(false),
Name: "zincati.service",
},
},
@ -200,7 +185,7 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
rosettaUnit := Systemd{
Units: []Unit{
{
Enabled: BoolToPtr(true),
Enabled: new(true),
Name: "rosetta-activation.service",
},
},
@ -236,7 +221,7 @@ func getDirs(usrName string) []Directory {
Path: d,
User: GetNodeUsr(usrName),
},
DirectoryEmbedded1: DirectoryEmbedded1{Mode: IntToPtr(0o755)},
DirectoryEmbedded1: DirectoryEmbedded1{Mode: new(0o755)},
}
dirs[i] = newDir
}
@ -254,13 +239,13 @@ func getFiles(usrName string, uid int, rootful bool, vmtype define.VMType, _ boo
Path: "/var/lib/systemd/linger/" + usrName,
User: GetNodeUsr("root"),
// the coreos image might already have this defined
Overwrite: BoolToPtr(true),
Overwrite: new(true),
},
FileEmbedded1: FileEmbedded1{
Contents: Resource{
Source: EncodeDataURLPtr(""),
},
Mode: IntToPtr(0o644),
Mode: new(0o644),
},
})
@ -295,7 +280,7 @@ pids_limit=0
Contents: Resource{
Source: EncodeDataURLPtr(containers),
},
Mode: IntToPtr(0o744),
Mode: new(0o744),
},
})
@ -306,14 +291,14 @@ pids_limit=0
Group: GetNodeGrp("root"),
Path: sub,
User: GetNodeUsr("root"),
Overwrite: BoolToPtr(true),
Overwrite: new(true),
},
FileEmbedded1: FileEmbedded1{
Append: nil,
Contents: Resource{
Source: EncodeDataURLPtr(etcSubUID),
},
Mode: IntToPtr(0o744),
Mode: new(0o744),
},
})
}
@ -332,7 +317,7 @@ pids_limit=0
Contents: Resource{
Source: EncodeDataURLPtr(fmt.Sprintf("%s\n", vmtype.String())),
},
Mode: IntToPtr(0o644),
Mode: new(0o644),
},
})
@ -346,7 +331,7 @@ pids_limit=0
Contents: Resource{
Source: EncodeDataURLPtr(GetPodmanDockerTmpConfig(uid, rootful, true)),
},
Mode: IntToPtr(0o644),
Mode: new(0o644),
},
})
@ -360,7 +345,7 @@ pids_limit=0
Contents: Resource{
Source: EncodeDataURLPtr(fmt.Sprintf("[zram0]\nzram-size=%d\n", swap)),
},
Mode: IntToPtr(0o644),
Mode: new(0o644),
},
})
}
@ -374,28 +359,28 @@ func getLinks() []Link {
Group: GetNodeGrp("root"),
Path: "/etc/systemd/user/sockets.target.wants/podman.socket",
User: GetNodeUsr("root"),
Overwrite: BoolToPtr(true),
Overwrite: new(true),
},
LinkEmbedded1: LinkEmbedded1{
Hard: BoolToPtr(false),
Hard: new(false),
Target: "/usr/lib/systemd/user/podman.socket",
},
}, {
Node: Node{
Group: GetNodeGrp("root"),
Path: "/usr/local/bin/docker",
Overwrite: BoolToPtr(true),
Overwrite: new(true),
User: GetNodeUsr("root"),
},
LinkEmbedded1: LinkEmbedded1{
Hard: BoolToPtr(false),
Hard: new(false),
Target: "/usr/bin/podman",
},
}}
}
func EncodeDataURLPtr(contents string) *string {
return StrToPtr(fmt.Sprintf("data:,%s", url.PathEscape(contents)))
return new(fmt.Sprintf("data:,%s", url.PathEscape(contents)))
}
func GetPodmanDockerTmpConfig(uid int, rootful bool, newline bool) string {
@ -471,7 +456,7 @@ func (i *IgnitionBuilder) AddPlaybook(contents string, destPath string, username
Contents: Resource{
Source: EncodeDataURLPtr(contents),
},
Mode: IntToPtr(0o744),
Mode: new(0o744),
},
}
@ -494,7 +479,7 @@ func (i *IgnitionBuilder) AddPlaybook(contents string, destPath string, username
// create a systemd service
playbookUnit := Unit{
Enabled: BoolToPtr(true),
Enabled: new(true),
Name: "playbook.service",
Contents: &unitContents,
}

4
pkg/machine/shim/host.go
View file

@ -275,9 +275,9 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) error {
}
readyUnit := ignition.Unit{
Enabled: ignition.BoolToPtr(true),
Enabled: new(true),
Name: "ready.service",
Contents: ignition.StrToPtr(readyUnitFile),
Contents: new(readyUnitFile),
}
ignBuilder.WithUnit(readyUnit)

12
pkg/machine/volume_systemd.go
View file

@ -66,9 +66,9 @@ func GenerateSystemDFilesForVirtiofsMounts(mounts []VirtIoFs) ([]ignition.Unit,
// On FCOS /home is a symlink to var/home; systemd rejects non-canonical paths.
canonicalTarget := canonicalizeFCOSMountTarget(mnt.Target)
virtiofsMount := ignition.Unit{
Enabled: ignition.BoolToPtr(true),
Enabled: new(true),
Name: fmt.Sprintf("%s.mount", parser.PathEscape(canonicalTarget)),
Contents: ignition.StrToPtr(fmt.Sprintf(mountUnitFile, mnt.Tag, canonicalTarget)),
Contents: new(fmt.Sprintf(mountUnitFile, mnt.Tag, canonicalTarget)),
}
unitFiles = append(unitFiles, virtiofsMount)
@ -90,9 +90,9 @@ func GenerateSystemDFilesForVirtiofsMounts(mounts []VirtIoFs) ([]ignition.Unit,
}
immutableRootOffUnit := ignition.Unit{
Contents: ignition.StrToPtr(immutableRootOffFile),
Contents: new(immutableRootOffFile),
Name: "immutable-root-off.service",
Enabled: ignition.BoolToPtr(true),
Enabled: new(true),
}
unitFiles = append(unitFiles, immutableRootOffUnit)
@ -111,9 +111,9 @@ func GenerateSystemDFilesForVirtiofsMounts(mounts []VirtIoFs) ([]ignition.Unit,
}
immutableRootOnUnit := ignition.Unit{
Contents: ignition.StrToPtr(immutableRootOnFile),
Contents: new(immutableRootOnFile),
Name: "immutable-root-on.service",
Enabled: ignition.BoolToPtr(true),
Enabled: new(true),
}
unitFiles = append(unitFiles, immutableRootOnUnit)

14
pkg/specgen/generate/kube/kube_test.go
View file

@ -188,10 +188,6 @@ func seccompProfile(profileType v1.SeccompProfileType, localhostProfile *string)
return &v1.SeccompProfile{Type: profileType, LocalhostProfile: localhostProfile}
}
func stringPtr(value string) *string {
return &value
}
func TestSetupSecurityContextSeccompProfile(t *testing.T) {
profileRoot := t.TempDir()
defaultPath, err := libpod.DefaultSeccompPath()
@ -216,14 +212,14 @@ func TestSetupSecurityContextSeccompProfile(t *testing.T) {
{
name: "pod profile",
pod: &v1.PodSecurityContext{
SeccompProfile: seccompProfile(v1.SeccompProfileTypeLocalhost, stringPtr("profiles/pod.json")),
SeccompProfile: seccompProfile(v1.SeccompProfileTypeLocalhost, new("profiles/pod.json")),
},
expected: filepath.Join(profileRoot, "profiles/pod.json"),
},
{
name: "container overrides pod",
ctr: &v1.SecurityContext{
SeccompProfile: seccompProfile(v1.SeccompProfileTypeLocalhost, stringPtr("profiles/container.json")),
SeccompProfile: seccompProfile(v1.SeccompProfileTypeLocalhost, new("profiles/container.json")),
},
pod: &v1.PodSecurityContext{
SeccompProfile: seccompProfile(v1.SeccompProfileTypeUnconfined, nil),
@ -251,7 +247,7 @@ func TestSetupSecurityContextSeccompProfile(t *testing.T) {
pod: &v1.PodSecurityContext{
SeccompProfile: seccompProfile(
v1.SeccompProfileTypeLocalhost,
stringPtr("profiles/pod.json"),
new("profiles/pod.json"),
),
},
seccompAnnotationPaths: &SeccompAnnotationPaths{
@ -283,7 +279,7 @@ func TestSetupSecurityContextSeccompProfile(t *testing.T) {
ctr: &v1.SecurityContext{
SeccompProfile: seccompProfile(
v1.SeccompProfileTypeLocalhost,
stringPtr("/etc/seccomp.json"),
new("/etc/seccomp.json"),
),
},
expectedError: "must be a relative path",
@ -293,7 +289,7 @@ func TestSetupSecurityContextSeccompProfile(t *testing.T) {
ctr: &v1.SecurityContext{
SeccompProfile: seccompProfile(
v1.SeccompProfileTypeLocalhost,
stringPtr("profiles/../seccomp.json"),
new("profiles/../seccomp.json"),
),
},
expectedError: "must not contain '..'",

6
test/e2e/network_create_test.go
View file

@ -21,10 +21,6 @@ func removeNetworkDevice(name string) {
session.WaitWithDefaultTimeout()
}
func uintPtr(u uint32) *uint32 {
return &u
}
var _ = Describe("Podman network create", func() {
It("podman network create with name and subnet", func() {
netName := "subnet-" + stringid.GenerateRandomID()
@ -710,6 +706,6 @@ var _ = Describe("Podman network create", func() {
Entry("blackhole route", "10.19.20.0/24", "10.21.10.0/24,blackhole", "10.21.10.0/24", types.RouteTypeBlackhole, nil),
Entry("unreachable route", "10.19.21.0/24", "10.21.11.0/24,unreachable", "10.21.11.0/24", types.RouteTypeUnreachable, nil),
Entry("prohibit route", "10.19.22.0/24", "10.21.12.0/24,prohibit", "10.21.12.0/24", types.RouteTypeProhibit, nil),
Entry("blackhole route with metric", "10.19.23.0/24", "10.21.13.0/24,blackhole,250", "10.21.13.0/24", types.RouteTypeBlackhole, uintPtr(250)),
Entry("blackhole route with metric", "10.19.23.0/24", "10.21.13.0/24,blackhole,250", "10.21.13.0/24", types.RouteTypeBlackhole, new(uint32(250))),
)
})