dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 17:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51922 from thaJeztah/gofumpt

Browse Source 
gofumpt code
This commit is contained in:
Sebastiaan van Stijn
2026-01-26 10:09:28 +01:00
committed by GitHub
parent 6859f48dc3 7b38ece108
commit ef8cf49a7d
21 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/types/network/hwaddr.go
View File

@@ -11,9 +11,11 @@ import (
// in the absence of go.dev/issue/29678.
type HardwareAddr net.HardwareAddr
var _ encoding.TextMarshaler = (HardwareAddr)(nil)
var _ encoding.TextUnmarshaler = (*HardwareAddr)(nil)
var _ fmt.Stringer = (HardwareAddr)(nil)
var (
_ encoding.TextMarshaler = (HardwareAddr)(nil)
_ encoding.TextUnmarshaler = (*HardwareAddr)(nil)
_ fmt.Stringer = (HardwareAddr)(nil)
)
func (m *HardwareAddr) UnmarshalText(text []byte) error {
if len(text) == 0 {

7
api/types/network/port_test.go
View File

@@ -14,8 +14,10 @@ type TestRanger interface {
Range() PortRange
}
var _ TestRanger = Port{}
var _ TestRanger = PortRange{}
var (
_ TestRanger = Port{}
_ TestRanger = PortRange{}
)
func TestPort(t *testing.T) {
t.Run("Zero Value", func(t *testing.T) {
@@ -344,7 +346,6 @@ func TestPortRange(t *testing.T) {
in string
portRange PortRange // output of ParsePortRange() and Range()
str string // output of String(). If "", use in.
}{
// Zero port
{

6
client/container_exec.go
View File

@@ -82,8 +82,7 @@ type ExecStartOptions struct {
}
// ExecStartResult holds the result of starting a container exec.
type ExecStartResult struct {
}
type ExecStartResult struct{}
// ExecStart starts an exec process already created in the docker host.
func (cli *Client) ExecStart(ctx context.Context, execID string, options ExecStartOptions) (ExecStartResult, error) {
@@ -160,8 +159,7 @@ func getConsoleSize(hasTTY bool, consoleSize ConsoleSize) (*[2]uint, error) {
}
// ExecInspectOptions holds options for inspecting a container exec.
type ExecInspectOptions struct {
}
type ExecInspectOptions struct{}
// ExecInspectResult holds the result of inspecting a container exec.
//

4
client/container_resize.go
View File

@@ -42,8 +42,7 @@ func (cli *Client) ContainerResize(ctx context.Context, containerID string, opti
type ExecResizeOptions ContainerResizeOptions
// ExecResizeResult holds the result of resizing a container exec TTY.
type ExecResizeResult struct {
}
type ExecResizeResult struct{}
// ExecResize changes the size of the tty for an exec process running inside a container.
func (cli *Client) ExecResize(ctx context.Context, execID string, options ExecResizeOptions) (ExecResizeResult, error) {
@@ -62,5 +61,4 @@ func (cli *Client) ExecResize(ctx context.Context, execID string, options ExecRe
return ExecResizeResult{}, err
}
return ExecResizeResult{}, nil
}

2
daemon/builder/remotecontext/remote_test.go
View File

@@ -173,7 +173,7 @@ func TestUnknownContentLength(t *testing.T) {
func TestDownloadRemote(t *testing.T) {
contextDir := t.TempDir()
createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0644)
createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0o644)
mux := http.NewServeMux()
server := httptest.NewServer(mux)

4
daemon/containerd/image_history.go
View File

@@ -44,9 +44,7 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string, platform *
return nil, err
}
var (
history []*imagetype.HistoryResponseItem
)
var history []*imagetype.HistoryResponseItem
s := i.client.SnapshotService(i.snapshotter)
diffIDs := ociImage.RootFS.DiffIDs

1
daemon/containerd/image_pull.go
View File

@@ -399,6 +399,7 @@ func newReferrersList() *referrersList {
m: make(map[digest.Digest][]ocispec.Descriptor),
}
}
func (rl *referrersList) Get(dgst digest.Digest) ([]ocispec.Descriptor, bool) {
rl.mu.RLock()
defer rl.mu.RUnlock()

1
daemon/containerd/platform_matchers_test.go
View File

@@ -168,6 +168,7 @@ func testOnlyAndOnlyStrict(t *testing.T, daemonPlatform platforms.MatchComparer,
}
})
}
func TestPlatformsWithPreferenceMatcher(t *testing.T) {
platformList := []ocispec.Platform{
pLinuxAmd64,

1
daemon/daemon.go
View File

@@ -658,7 +658,6 @@ func (daemon *Daemon) restore(ctx context.Context, cfg *configStore, containers
if err := daemon.containerRm(&cfg.Config, cid, &backend.ContainerRmConfig{ForceRemove: true, RemoveVolume: true}); err != nil {
log.G(ctx).WithField("container", cid).WithError(err).Error("failed to remove container")
}
}(id, c)
}
group.Wait()

6
daemon/internal/builder-next/exporter/exporter.go
View File

@@ -2,8 +2,10 @@ package exporter
import "time"
const Moby = "moby"
const BuildRefLabel = "moby/build.ref."
const (
Moby = "moby"
BuildRefLabel = "moby/build.ref."
)
type BuildRefLabelValue struct {
CreatedAt *time.Time `json:"createdAt,omitempty"`

2
daemon/libnetwork/drivers/ipvlan/ipvlan_network.go
View File

@@ -172,7 +172,7 @@ func (d *driver) DeleteNetwork(nid string) error {
// parseNetworkOptions parses docker network options
func parseNetworkOptions(id string, option options.Generic) (*configuration, error) {
var config = &configuration{}
config := &configuration{}
// parse generic labels first
if genData, ok := option[netlabel.GenericData]; ok && genData != nil {

2
daemon/libnetwork/drivers/macvlan/macvlan_network.go
View File

@@ -198,7 +198,7 @@ func (d *driver) DeleteNetwork(nid string) error {
// parseNetworkOptions parses docker network options
func parseNetworkOptions(id string, option options.Generic) (*configuration, error) {
var config = &configuration{}
config := &configuration{}
// parse generic labels first
if genData, ok := option[netlabel.GenericData]; ok && genData != nil {

2
daemon/libnetwork/networkdb/debug.go
View File

@@ -22,7 +22,7 @@ func logEncKeys(ctx context.Context, keys ...[]byte) {
"path": klpath,
}).Error("could not write to NetworkDB encryption-key log")
}
f, err := os.OpenFile(klpath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
f, err := os.OpenFile(klpath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o600)
if err != nil {
die(err)
return

4
daemon/libnetwork/networkdb/networkdb_property_test.go
View File

@@ -110,11 +110,11 @@ func testConvergence(t *rapid.T) {
// Log the convergence time to disk for later statistical analysis.
if err := os.Mkdir("testdata", 0755); err != nil && !os.IsExist(err) {
if err := os.Mkdir("testdata", 0o755); err != nil && !os.IsExist(err) {
t.Logf("Could not log convergence time to disk: failed to create testdata directory: %v", err)
return
}
f, err := os.OpenFile("testdata/convergence_time.csv", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
f, err := os.OpenFile("testdata/convergence_time.csv", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
t.Logf("Could not log convergence time to disk: failed to open file: %v", err)
return

3
daemon/libnetwork/service_linux.go
View File

@@ -450,7 +450,6 @@ func generateIngressRules(port *PortConfig, destIP net.IP) []iptables.Rule {
}
func programIngressPortsRules(gwIP net.IP, filteredPorts []*PortConfig) (portErr error) {
rollbackRules := make([]iptables.Rule, 0, len(filteredPorts)*3)
defer func() {
if portErr != nil {
@@ -463,7 +462,6 @@ func programIngressPortsRules(gwIP net.IP, filteredPorts []*PortConfig) (portErr
}()
for _, iPort := range filteredPorts {
for _, rule := range generateIngressRules(iPort, gwIP) {
if portErr = rule.Insert(); portErr != nil {
err := fmt.Errorf("set up rule failed, %v: %v", rule, portErr)
@@ -477,7 +475,6 @@ func programIngressPortsRules(gwIP net.IP, filteredPorts []*PortConfig) (portErr
}
func deleteIngressPortsRules(gwIP net.IP, filteredPorts []*PortConfig) error {
var portErr error
for _, iPort := range filteredPorts {

1
daemon/stats_unix.go
View File

@@ -336,7 +336,6 @@ func readSystemCPUUsage(r io.Reader) (cpuUsage uint64, cpuNum uint32, _ error) {
for {
data, isPartial, err := rdr.ReadLine()
if err != nil {
return 0, 0, fmt.Errorf("error scanning /proc/stat file: %w", err)
}

1
integration/container/stop_test.go
View File

@@ -152,7 +152,6 @@ func TestContainerAPIPostContainerStop(t *testing.T) {
for _, tc := range tests {
t.Run(tc.testName, func(t *testing.T) {
res, _, err := request.Post(ctx, "/containers/"+tc.id+"/stop")
assert.Equal(t, res.StatusCode, tc.expStatusCode)

1
integration/image/import_test.go
View File

@@ -242,5 +242,4 @@ func TestImageImportBadSrc(t *testing.T) {
assert.Check(t, tc.expectErr(err))
})
}
}

8
vendor/github.com/moby/moby/api/types/network/hwaddr.go generated vendored
View File

@@ -11,9 +11,11 @@ import (
// in the absence of go.dev/issue/29678.
type HardwareAddr net.HardwareAddr
var _ encoding.TextMarshaler = (HardwareAddr)(nil)
var _ encoding.TextUnmarshaler = (*HardwareAddr)(nil)
var _ fmt.Stringer = (HardwareAddr)(nil)
var (
_ encoding.TextMarshaler = (HardwareAddr)(nil)
_ encoding.TextUnmarshaler = (*HardwareAddr)(nil)
_ fmt.Stringer = (HardwareAddr)(nil)
)
func (m *HardwareAddr) UnmarshalText(text []byte) error {
if len(text) == 0 {

6
vendor/github.com/moby/moby/client/container_exec.go generated vendored
View File

@@ -82,8 +82,7 @@ type ExecStartOptions struct {
}
// ExecStartResult holds the result of starting a container exec.
type ExecStartResult struct {
}
type ExecStartResult struct{}
// ExecStart starts an exec process already created in the docker host.
func (cli *Client) ExecStart(ctx context.Context, execID string, options ExecStartOptions) (ExecStartResult, error) {
@@ -160,8 +159,7 @@ func getConsoleSize(hasTTY bool, consoleSize ConsoleSize) (*[2]uint, error) {
}
// ExecInspectOptions holds options for inspecting a container exec.
type ExecInspectOptions struct {
}
type ExecInspectOptions struct{}
// ExecInspectResult holds the result of inspecting a container exec.
//

4
vendor/github.com/moby/moby/client/container_resize.go generated vendored
View File

@@ -42,8 +42,7 @@ func (cli *Client) ContainerResize(ctx context.Context, containerID string, opti
type ExecResizeOptions ContainerResizeOptions
// ExecResizeResult holds the result of resizing a container exec TTY.
type ExecResizeResult struct {
}
type ExecResizeResult struct{}
// ExecResize changes the size of the tty for an exec process running inside a container.
func (cli *Client) ExecResize(ctx context.Context, execID string, options ExecResizeOptions) (ExecResizeResult, error) {
@@ -62,5 +61,4 @@ func (cli *Client) ExecResize(ctx context.Context, execID string, options ExecRe
return ExecResizeResult{}, err
}
return ExecResizeResult{}, nil
}