d9d0683862
- un-export `daemonOptions.InstallFlags()`; `daemonOptions` itself isn't exported, not exported, and `InstallFlags()` isn't matching any interface and only used internally. - un-export `daemonOptions.SetDefaultOptions()` and remove the `flags` argument as we were passing `daemonOptions.flags` as argument on a method attached to `daemonOptions`, which was somewhat backwards. While at it, also removing an intermediate variable that wasn't needed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
44 lines
1.3 KiB
Go
44 lines
1.3 KiB
Go
package main
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
cliconfig "github.com/docker/docker/cli/config"
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/spf13/pflag"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestCommonOptionsInstallFlags(t *testing.T) {
|
|
flags := pflag.NewFlagSet("testing", pflag.ContinueOnError)
|
|
opts := newDaemonOptions(&config.Config{})
|
|
opts.installFlags(flags)
|
|
|
|
err := flags.Parse([]string{
|
|
"--tlscacert=/foo/cafile",
|
|
"--tlscert=/foo/cert",
|
|
"--tlskey=/foo/key",
|
|
})
|
|
assert.Check(t, err)
|
|
assert.Check(t, is.Equal("/foo/cafile", opts.TLSOptions.CAFile))
|
|
assert.Check(t, is.Equal("/foo/cert", opts.TLSOptions.CertFile))
|
|
assert.Check(t, is.Equal(opts.TLSOptions.KeyFile, "/foo/key"))
|
|
}
|
|
|
|
func defaultPath(filename string) string {
|
|
return filepath.Join(cliconfig.Dir(), filename)
|
|
}
|
|
|
|
func TestCommonOptionsInstallFlagsWithDefaults(t *testing.T) {
|
|
flags := pflag.NewFlagSet("testing", pflag.ContinueOnError)
|
|
opts := newDaemonOptions(&config.Config{})
|
|
opts.installFlags(flags)
|
|
|
|
err := flags.Parse([]string{})
|
|
assert.Check(t, err)
|
|
assert.Check(t, is.Equal(defaultPath("ca.pem"), opts.TLSOptions.CAFile))
|
|
assert.Check(t, is.Equal(defaultPath("cert.pem"), opts.TLSOptions.CertFile))
|
|
assert.Check(t, is.Equal(defaultPath("key.pem"), opts.TLSOptions.KeyFile))
|
|
}
|