From fa150ca75965d65147f54b9de796e4ea30e92c99 Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Sun, 30 Jun 2024 17:33:25 +0800 Subject: [PATCH] cleanup: Remove unnecessary return value The return error of `installCommonConfigFlags` is unnecessary since it only return nil. Signed-off-by: Lei Jitang --- cmd/dockerd/config.go | 4 +--- cmd/dockerd/config_unix.go | 7 ++----- cmd/dockerd/config_unix_test.go | 3 +-- cmd/dockerd/config_windows.go | 7 ++----- cmd/dockerd/daemon_test.go | 3 +-- cmd/dockerd/docker.go | 4 +--- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/cmd/dockerd/config.go b/cmd/dockerd/config.go index 02d606cc1e037..5fc8986de3ed0 100644 --- a/cmd/dockerd/config.go +++ b/cmd/dockerd/config.go @@ -10,7 +10,7 @@ import ( ) // installCommonConfigFlags adds flags to the pflag.FlagSet to configure the daemon -func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { +func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) { var ( allowNonDistributable = opts.NewNamedListOptsRef("allow-nondistributable-artifacts", &conf.AllowNondistributableArtifacts, registry.ValidateIndexName) registryMirrors = opts.NewNamedListOptsRef("registry-mirrors", &conf.Mirrors, registry.ValidateMirror) @@ -79,6 +79,4 @@ func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { _ = flags.MarkDeprecated("api-cors-header", "accessing Docker API through a browser is insecure; use a reverse proxy if you need CORS headers") flags.BoolVarP(&conf.AutoRestart, "restart", "r", true, "--restart on the daemon has been deprecated in favor of --restart policies on docker run") _ = flags.MarkDeprecated("restart", "Please use a restart policy on docker run") - - return nil } diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go index 15a047725b429..c9f240ebfdacd 100644 --- a/cmd/dockerd/config_unix.go +++ b/cmd/dockerd/config_unix.go @@ -15,11 +15,9 @@ import ( ) // installConfigFlags adds flags to the pflag.FlagSet to configure the daemon -func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { +func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) { // First handle install flags which are consistent cross-platform - if err := installCommonConfigFlags(conf, flags); err != nil { - return err - } + installCommonConfigFlags(conf, flags) // Then platform-specific install flags flags.Var(opts.NewNamedRuntimeOpt("runtimes", &conf.Runtimes, config.StockRuntimeName), "add-runtime", "Register an additional OCI compatible runtime") @@ -58,7 +56,6 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { // Note that conf.BridgeConfig.UserlandProxyPath and honorXDG are configured according to the value of rootless.RunningWithRootlessKit, not the value of --rootless. flags.BoolVar(&conf.Rootless, "rootless", conf.Rootless, "Enable rootless mode; typically used with RootlessKit") flags.StringVar(&conf.CgroupNamespaceMode, "default-cgroupns-mode", conf.CgroupNamespaceMode, `Default mode for containers cgroup namespace ("host" | "private")`) - return nil } // configureCertsDir configures registry.CertsDir() depending on if the daemon diff --git a/cmd/dockerd/config_unix_test.go b/cmd/dockerd/config_unix_test.go index adb2b61eb269b..5072f3076edd7 100644 --- a/cmd/dockerd/config_unix_test.go +++ b/cmd/dockerd/config_unix_test.go @@ -16,8 +16,7 @@ func TestDaemonParseShmSize(t *testing.T) { conf, err := config.New() assert.NilError(t, err) - err = installConfigFlags(conf, flags) - assert.NilError(t, err) + installConfigFlags(conf, flags) // By default `--default-shm-size=64M` assert.Check(t, is.Equal(int64(64*1024*1024), conf.ShmSize.Value())) assert.Check(t, flags.Set("default-shm-size", "128M")) diff --git a/cmd/dockerd/config_windows.go b/cmd/dockerd/config_windows.go index d8bebf4486100..a6af5c78499b3 100644 --- a/cmd/dockerd/config_windows.go +++ b/cmd/dockerd/config_windows.go @@ -6,17 +6,14 @@ import ( ) // installConfigFlags adds flags to the pflag.FlagSet to configure the daemon -func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { +func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) { // First handle install flags which are consistent cross-platform - if err := installCommonConfigFlags(conf, flags); err != nil { - return err - } + installCommonConfigFlags(conf, flags) // Then platform-specific install flags. flags.StringVar(&conf.BridgeConfig.FixedCIDR, "fixed-cidr", "", "IPv4 subnet for fixed IPs") flags.StringVarP(&conf.BridgeConfig.Iface, "bridge", "b", "", "Attach containers to a virtual switch") flags.StringVarP(&conf.SocketGroup, "group", "G", "", "Users or groups that can access the named pipe") - return nil } // configureCertsDir configures registry.CertsDir() depending on if the daemon diff --git a/cmd/dockerd/daemon_test.go b/cmd/dockerd/daemon_test.go index 95776cca9850d..986ef52cd3924 100644 --- a/cmd/dockerd/daemon_test.go +++ b/cmd/dockerd/daemon_test.go @@ -18,8 +18,7 @@ func defaultOptions(t *testing.T, configFile string) *daemonOptions { opts := newDaemonOptions(cfg) opts.flags = &pflag.FlagSet{} opts.installFlags(opts.flags) - err = installConfigFlags(opts.daemonConfig, opts.flags) - assert.NilError(t, err) + installConfigFlags(opts.daemonConfig, opts.flags) defaultDaemonConfigFile, err := getDefaultDaemonConfigFile() assert.NilError(t, err) opts.flags.StringVar(&opts.configFile, "config-file", defaultDaemonConfigFile, "") diff --git a/cmd/dockerd/docker.go b/cmd/dockerd/docker.go index 3fdde1073bba8..15698a450372c 100644 --- a/cmd/dockerd/docker.go +++ b/cmd/dockerd/docker.go @@ -50,9 +50,7 @@ func newDaemonCommand() (*cobra.Command, error) { flags.StringVar(&opts.configFile, "config-file", defaultDaemonConfigFile, "Daemon configuration file") configureCertsDir() opts.installFlags(flags) - if err := installConfigFlags(opts.daemonConfig, flags); err != nil { - return nil, err - } + installConfigFlags(opts.daemonConfig, flags) installServiceFlags(flags) return cmd, nil