Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3798 from thaJeztah/gofumpt_linting 

Use gofumpt if available, and enable gofumpt linter
This commit is contained in:
Sebastiaan van Stijn 2022-11-04 19:04:51 +01:00 committed by GitHub
parent ceecf3048c c2f1671595
commit 8a19043cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 97 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -4,6 +4,7 @@ linters:
- depguard - depguard
- dogsled - dogsled
- gocyclo - gocyclo
- gofumpt
- goimports - goimports
- gosec - gosec
- gosimple - gosimple

2
CONTRIBUTING.md
View File

@ -333,7 +333,7 @@ mind when nudging others to comply.
The rules: The rules:
1. All code should be formatted with `gofmt -s`. 1. All code should be formatted with `gofumpt` (preferred) or `gofmt -s`.
2. All code should pass the default levels of 2. All code should pass the default levels of
[`golint`](https://github.com/golang/lint). [`golint`](https://github.com/golang/lint).
3. All code should follow the guidelines covered in [Effective 3. All code should follow the guidelines covered in [Effective

13
Makefile
View File

@ -5,6 +5,11 @@
# Sets the name of the company that produced the windows binary. # Sets the name of the company that produced the windows binary.
PACKAGER_NAME ?= PACKAGER_NAME ?=
# The repository doesn't have a go.mod, but "go list", and "gotestsum"
# expect to be run from a module.
GO111MODULE=auto
export GO111MODULE
all: binary all: binary
_:=$(shell ./scripts/warn-outside-container $(MAKECMDGOALS)) _:=$(shell ./scripts/warn-outside-container $(MAKECMDGOALS))
@ -45,8 +50,12 @@ shellcheck: ## run shellcheck validation
find scripts/ contrib/completion/bash -type f | grep -v scripts/winresources | grep -v '.*.ps1' | xargs shellcheck find scripts/ contrib/completion/bash -type f | grep -v scripts/winresources | grep -v '.*.ps1' | xargs shellcheck
.PHONY: fmt .PHONY: fmt
fmt: ## run gofmt fmt: ## run gofumpt (if present) or gofmt
go list -f {{.Dir}} ./... | xargs gofmt -w -s -d @if command -v gofumpt > /dev/null; then \
gofumpt -w -d -lang=1.19 . ; \
else \
go list -f {{.Dir}} ./... | xargs gofmt -w -s -d ; \
fi
.PHONY: binary .PHONY: binary
binary: ## build executable for Linux binary: ## build executable for Linux

8
cli-plugins/manager/manager_test.go
View File

@ -86,10 +86,10 @@ func TestGetPlugin(t *testing.T) {
dir := fs.NewDir(t, t.Name(), dir := fs.NewDir(t, t.Name(),
fs.WithFile("docker-bbb", ` fs.WithFile("docker-bbb", `
#!/bin/sh #!/bin/sh
echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0777)), echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0o777)),
fs.WithFile("docker-aaa", ` fs.WithFile("docker-aaa", `
#!/bin/sh #!/bin/sh
echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0777)), echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0o777)),
) )
defer dir.Remove() defer dir.Remove()
@ -109,10 +109,10 @@ func TestListPluginsIsSorted(t *testing.T) {
dir := fs.NewDir(t, t.Name(), dir := fs.NewDir(t, t.Name(),
fs.WithFile("docker-bbb", ` fs.WithFile("docker-bbb", `
#!/bin/sh #!/bin/sh
echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0777)), echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0o777)),
fs.WithFile("docker-aaa", ` fs.WithFile("docker-aaa", `
#!/bin/sh #!/bin/sh
echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0777)), echo '{"SchemaVersion":"0.1.0"}'`, fs.WithMode(0o777)),
) )
defer dir.Remove() defer dir.Remove()

2
cli/command/context/export-import_test.go
View File

@ -69,7 +69,7 @@ func TestExportExistingFile(t *testing.T) {
contextFile := filepath.Join(t.TempDir(), "exported") contextFile := filepath.Join(t.TempDir(), "exported")
cli := makeFakeCli(t) cli := makeFakeCli(t)
cli.ErrBuffer().Reset() cli.ErrBuffer().Reset()
assert.NilError(t, os.WriteFile(contextFile, []byte{}, 0644)) assert.NilError(t, os.WriteFile(contextFile, []byte{}, 0o644))
err := RunExport(cli, &ExportOptions{ContextName: "test", Dest: contextFile}) err := RunExport(cli, &ExportOptions{ContextName: "test", Dest: contextFile})
assert.Assert(t, os.IsExist(err)) assert.Assert(t, os.IsExist(err))
} }

2
cli/command/context/export.go
View File

@ -52,7 +52,7 @@ func writeTo(dockerCli command.Cli, reader io.Reader, dest string) error {
} }
writer = dockerCli.Out() writer = dockerCli.Out()
} else { } else {
f, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600) f, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0o600)
if err != nil { if err != nil {
return err return err
} }

2
cli/command/image/build.go
View File

@ -400,7 +400,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
if imageID == "" { if imageID == "" {
return errors.Errorf("Server did not provide an image ID. Cannot write %s", options.imageIDFile) return errors.Errorf("Server did not provide an image ID. Cannot write %s", options.imageIDFile)
} }
if err := os.WriteFile(options.imageIDFile, []byte(imageID), 0666); err != nil { if err := os.WriteFile(options.imageIDFile, []byte(imageID), 0o666); err != nil {
return err return err
} }
} }

4
cli/command/image/build/context.go
View File

@ -384,7 +384,7 @@ func AddDockerfileToBuildContext(dockerfileCtx io.ReadCloser, buildCtx io.ReadCl
randomName: func(_ string, _ *tar.Header, _ io.Reader) (*tar.Header, []byte, error) { randomName: func(_ string, _ *tar.Header, _ io.Reader) (*tar.Header, []byte, error) {
header := &tar.Header{ header := &tar.Header{
Name: randomName, Name: randomName,
Mode: 0600, Mode: 0o600,
ModTime: now, ModTime: now,
Typeflag: tar.TypeReg, Typeflag: tar.TypeReg,
AccessTime: now, AccessTime: now,
@ -397,7 +397,7 @@ func AddDockerfileToBuildContext(dockerfileCtx io.ReadCloser, buildCtx io.ReadCl
if h == nil { if h == nil {
h = &tar.Header{ h = &tar.Header{
Name: ".dockerignore", Name: ".dockerignore",
Mode: 0600, Mode: 0o600,
ModTime: now, ModTime: now,
Typeflag: tar.TypeReg, Typeflag: tar.TypeReg,
AccessTime: now, AccessTime: now,

2
cli/command/image/build/context_test.go
View File

@ -233,7 +233,7 @@ func createTestTempDir(t *testing.T) string {
func createTestTempFile(t *testing.T, dir, filename, contents string) string { func createTestTempFile(t *testing.T, dir, filename, contents string) string {
t.Helper() t.Helper()
filePath := filepath.Join(dir, filename) filePath := filepath.Join(dir, filename)
err := os.WriteFile(filePath, []byte(contents), 0777) err := os.WriteFile(filePath, []byte(contents), 0o777)
assert.NilError(t, err) assert.NilError(t, err)
return filePath return filePath
} }

4
cli/command/image/build_test.go
View File

@ -139,9 +139,9 @@ func TestRunBuildFromLocalGitHubDir(t *testing.T) {
t.Setenv("DOCKER_BUILDKIT", "0") t.Setenv("DOCKER_BUILDKIT", "0")
buildDir := filepath.Join(t.TempDir(), "github.com", "docker", "no-such-repository") buildDir := filepath.Join(t.TempDir(), "github.com", "docker", "no-such-repository")
err := os.MkdirAll(buildDir, 0777) err := os.MkdirAll(buildDir, 0o777)
assert.NilError(t, err) assert.NilError(t, err)
err = os.WriteFile(filepath.Join(buildDir, "Dockerfile"), []byte("FROM busybox\n"), 0644) err = os.WriteFile(filepath.Join(buildDir, "Dockerfile"), []byte("FROM busybox\n"), 0o644)
assert.NilError(t, err) assert.NilError(t, err)
client := test.NewFakeCli(&fakeClient{}) client := test.NewFakeCli(&fakeClient{})

4
cli/command/service/create_test.go
View File

@ -118,7 +118,7 @@ func TestSetConfigsWithCredSpecAndConfigs(t *testing.T) {
// these are the default field values // these are the default field values
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}), "expected configRefs to contain bar config") }), "expected configRefs to contain bar config")
} }
@ -229,7 +229,7 @@ func TestSetConfigsOnlyConfigs(t *testing.T) {
// these are the default field values // these are the default field values
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
})) }))
} }

6
cli/command/service/update_test.go
View File

@ -1066,7 +1066,7 @@ func TestUpdateGetUpdatedConfigs(t *testing.T) {
Name: "foo", Name: "foo",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
"barRef": { "barRef": {
@ -1076,7 +1076,7 @@ func TestUpdateGetUpdatedConfigs(t *testing.T) {
Name: "bar", Name: "bar",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
"bazRef": { "bazRef": {
@ -1086,7 +1086,7 @@ func TestUpdateGetUpdatedConfigs(t *testing.T) {
Name: "baz", Name: "baz",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
"credRef": { "credRef": {

2
cli/command/trust/key_load.go
View File

@ -20,7 +20,7 @@ import (
) )
const ( const (
nonOwnerReadWriteMask = 0077 nonOwnerReadWriteMask = 0o077
) )
type keyLoadOptions struct { type keyLoadOptions struct {

10
cli/command/trust/key_load_test.go
View File

@ -175,7 +175,7 @@ func TestLoadKeyTooPermissive(t *testing.T) {
func testLoadKeyTooPermissive(t *testing.T, privKeyFixture []byte) { func testLoadKeyTooPermissive(t *testing.T, privKeyFixture []byte) {
privKeyDir := t.TempDir() privKeyDir := t.TempDir()
privKeyFilepath := filepath.Join(privKeyDir, "privkey477.pem") privKeyFilepath := filepath.Join(privKeyDir, "privkey477.pem")
assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0477)) assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0o477))
// import the key to our keyStorageDir // import the key to our keyStorageDir
_, err := getPrivKeyBytesFromPath(privKeyFilepath) _, err := getPrivKeyBytesFromPath(privKeyFilepath)
@ -183,27 +183,27 @@ func testLoadKeyTooPermissive(t *testing.T, privKeyFixture []byte) {
assert.Error(t, err, expected) assert.Error(t, err, expected)
privKeyFilepath = filepath.Join(privKeyDir, "privkey667.pem") privKeyFilepath = filepath.Join(privKeyDir, "privkey667.pem")
assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0677)) assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0o677))
_, err = getPrivKeyBytesFromPath(privKeyFilepath) _, err = getPrivKeyBytesFromPath(privKeyFilepath)
expected = fmt.Sprintf("private key file %s must not be readable or writable by others", privKeyFilepath) expected = fmt.Sprintf("private key file %s must not be readable or writable by others", privKeyFilepath)
assert.Error(t, err, expected) assert.Error(t, err, expected)
privKeyFilepath = filepath.Join(privKeyDir, "privkey777.pem") privKeyFilepath = filepath.Join(privKeyDir, "privkey777.pem")
assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0777)) assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0o777))
_, err = getPrivKeyBytesFromPath(privKeyFilepath) _, err = getPrivKeyBytesFromPath(privKeyFilepath)
expected = fmt.Sprintf("private key file %s must not be readable or writable by others", privKeyFilepath) expected = fmt.Sprintf("private key file %s must not be readable or writable by others", privKeyFilepath)
assert.Error(t, err, expected) assert.Error(t, err, expected)
privKeyFilepath = filepath.Join(privKeyDir, "privkey400.pem") privKeyFilepath = filepath.Join(privKeyDir, "privkey400.pem")
assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0400)) assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0o400))
_, err = getPrivKeyBytesFromPath(privKeyFilepath) _, err = getPrivKeyBytesFromPath(privKeyFilepath)
assert.NilError(t, err) assert.NilError(t, err)
privKeyFilepath = filepath.Join(privKeyDir, "privkey600.pem") privKeyFilepath = filepath.Join(privKeyDir, "privkey600.pem")
assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0600)) assert.NilError(t, os.WriteFile(privKeyFilepath, privKeyFixture, 0o600))
_, err = getPrivKeyBytesFromPath(privKeyFilepath) _, err = getPrivKeyBytesFromPath(privKeyFilepath)
assert.NilError(t, err) assert.NilError(t, err)

2
cli/command/trust/signer_add.go
View File

@ -117,7 +117,7 @@ func ingestPublicKeys(pubKeyPaths []string) ([]data.PublicKey, error) {
pubKeys := []data.PublicKey{} pubKeys := []data.PublicKey{}
for _, pubKeyPath := range pubKeyPaths { for _, pubKeyPath := range pubKeyPaths {
// Read public key bytes from PEM file, limit to 1 KiB // Read public key bytes from PEM file, limit to 1 KiB
pubKeyFile, err := os.OpenFile(pubKeyPath, os.O_RDONLY, 0666) pubKeyFile, err := os.OpenFile(pubKeyPath, os.O_RDONLY, 0o666)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "unable to read public key from file") return nil, errors.Wrap(err, "unable to read public key from file")
} }

4
cli/command/utils_test.go
View File

@ -39,10 +39,10 @@ func TestValidateOutputPath(t *testing.T) {
basedir := t.TempDir() basedir := t.TempDir()
dir := filepath.Join(basedir, "dir") dir := filepath.Join(basedir, "dir")
notexist := filepath.Join(basedir, "notexist") notexist := filepath.Join(basedir, "notexist")
err := os.MkdirAll(dir, 0755) err := os.MkdirAll(dir, 0o755)
assert.NilError(t, err) assert.NilError(t, err)
file := filepath.Join(dir, "file") file := filepath.Join(dir, "file")
err = os.WriteFile(file, []byte("hi"), 0644) err = os.WriteFile(file, []byte("hi"), 0o644)
assert.NilError(t, err) assert.NilError(t, err)
testcases := []struct { testcases := []struct {
path string path string

2
cli/compose/convert/service.go
View File

@ -406,7 +406,7 @@ func convertFileObject(
} }
mode := config.Mode mode := config.Mode
if mode == nil { if mode == nil {
mode = uint32Ptr(0444) mode = uint32Ptr(0o444)
} }
return swarmReferenceObject{ return swarmReferenceObject{

14
cli/compose/convert/service_test.go
View File

@ -427,7 +427,7 @@ func TestConvertFileObject(t *testing.T) {
Target: "target", Target: "target",
UID: "user", UID: "user",
GID: "group", GID: "group",
Mode: uint32Ptr(0644), Mode: uint32Ptr(0o644),
} }
swarmRef, err := convertFileObject(namespace, config, lookupConfig) swarmRef, err := convertFileObject(namespace, config, lookupConfig)
assert.NilError(t, err) assert.NilError(t, err)
@ -438,7 +438,7 @@ func TestConvertFileObject(t *testing.T) {
Name: config.Target, Name: config.Target,
UID: config.UID, UID: config.UID,
GID: config.GID, GID: config.GID,
Mode: os.FileMode(0644), Mode: os.FileMode(0o644),
}, },
} }
assert.Check(t, is.DeepEqual(expected, swarmRef)) assert.Check(t, is.DeepEqual(expected, swarmRef))
@ -463,7 +463,7 @@ func TestConvertFileObjectDefaults(t *testing.T) {
Name: config.Source, Name: config.Source,
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: os.FileMode(0444), Mode: os.FileMode(0o444),
}, },
} }
assert.Check(t, is.DeepEqual(expected, swarmRef)) assert.Check(t, is.DeepEqual(expected, swarmRef))
@ -511,7 +511,7 @@ func TestConvertServiceSecrets(t *testing.T) {
Name: "bar_secret", Name: "bar_secret",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
{ {
@ -520,7 +520,7 @@ func TestConvertServiceSecrets(t *testing.T) {
Name: "foo_secret", Name: "foo_secret",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
} }
@ -570,7 +570,7 @@ func TestConvertServiceConfigs(t *testing.T) {
Name: "bar_config", Name: "bar_config",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
{ {
@ -583,7 +583,7 @@ func TestConvertServiceConfigs(t *testing.T) {
Name: "foo_config", Name: "foo_config",
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
}, },
} }

4
cli/compose/loader/full-struct_test.go
View File

@ -58,7 +58,7 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
Target: "/my_config", Target: "/my_config",
UID: "103", UID: "103",
GID: "103", GID: "103",
Mode: uint32Ptr(0440), Mode: uint32Ptr(0o440),
}, },
}, },
ContainerName: "my-web-container", ContainerName: "my-web-container",
@ -342,7 +342,7 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
Target: "my_secret", Target: "my_secret",
UID: "103", UID: "103",
GID: "103", GID: "103",
Mode: uint32Ptr(0440), Mode: uint32Ptr(0o440),
}, },
}, },
SecurityOpt: []string{ SecurityOpt: []string{

18
cli/config/config_test.go
View File

@ -72,7 +72,7 @@ func TestEmptyFile(t *testing.T) {
tmpHome := t.TempDir() tmpHome := t.TempDir()
fn := filepath.Join(tmpHome, ConfigFileName) fn := filepath.Join(tmpHome, ConfigFileName)
err := os.WriteFile(fn, []byte(""), 0600) err := os.WriteFile(fn, []byte(""), 0o600)
assert.NilError(t, err) assert.NilError(t, err)
_, err = Load(tmpHome) _, err = Load(tmpHome)
@ -83,7 +83,7 @@ func TestEmptyJSON(t *testing.T) {
tmpHome := t.TempDir() tmpHome := t.TempDir()
fn := filepath.Join(tmpHome, ConfigFileName) fn := filepath.Join(tmpHome, ConfigFileName)
err := os.WriteFile(fn, []byte("{}"), 0600) err := os.WriteFile(fn, []byte("{}"), 0o600)
assert.NilError(t, err) assert.NilError(t, err)
config, err := Load(tmpHome) config, err := Load(tmpHome)
@ -116,7 +116,7 @@ func TestNewJSON(t *testing.T) {
fn := filepath.Join(tmpHome, ConfigFileName) fn := filepath.Join(tmpHome, ConfigFileName)
js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } } }` js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } } }`
if err := os.WriteFile(fn, []byte(js), 0600); err != nil { if err := os.WriteFile(fn, []byte(js), 0o600); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -148,7 +148,7 @@ func TestNewJSONNoEmail(t *testing.T) {
fn := filepath.Join(tmpHome, ConfigFileName) fn := filepath.Join(tmpHome, ConfigFileName)
js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } } }` js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } } }`
if err := os.WriteFile(fn, []byte(js), 0600); err != nil { if err := os.WriteFile(fn, []byte(js), 0o600); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -183,7 +183,7 @@ func TestJSONWithPsFormat(t *testing.T) {
"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } }, "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
"psFormat": "table {{.ID}}\\t{{.Label \"com.docker.label.cpu\"}}" "psFormat": "table {{.ID}}\\t{{.Label \"com.docker.label.cpu\"}}"
}` }`
if err := os.WriteFile(fn, []byte(js), 0600); err != nil { if err := os.WriteFile(fn, []byte(js), 0o600); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -210,7 +210,7 @@ func TestJSONWithCredentialStore(t *testing.T) {
"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } }, "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
"credsStore": "crazy-secure-storage" "credsStore": "crazy-secure-storage"
}` }`
if err := os.WriteFile(fn, []byte(js), 0600); err != nil { if err := os.WriteFile(fn, []byte(js), 0o600); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -237,7 +237,7 @@ func TestJSONWithCredentialHelpers(t *testing.T) {
"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } }, "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
"credHelpers": { "images.io": "images-io", "containers.com": "crazy-secure-storage" } "credHelpers": { "images.io": "images-io", "containers.com": "crazy-secure-storage" }
}` }`
if err := os.WriteFile(fn, []byte(js), 0600); err != nil { if err := os.WriteFile(fn, []byte(js), 0o600); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -325,7 +325,7 @@ func TestJSONSaveWithNoFile(t *testing.T) {
tmpHome := t.TempDir() tmpHome := t.TempDir()
fn := filepath.Join(tmpHome, ConfigFileName) fn := filepath.Join(tmpHome, ConfigFileName)
f, _ := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) f, _ := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
defer f.Close() defer f.Close()
assert.NilError(t, config.SaveToWriter(f)) assert.NilError(t, config.SaveToWriter(f))
@ -350,7 +350,7 @@ func TestLoadDefaultConfigFile(t *testing.T) {
filename := filepath.Join(dir, ConfigFileName) filename := filepath.Join(dir, ConfigFileName)
content := []byte(`{"PsFormat": "format"}`) content := []byte(`{"PsFormat": "format"}`)
err := os.WriteFile(filename, content, 0644) err := os.WriteFile(filename, content, 0o644)
assert.NilError(t, err) assert.NilError(t, err)
configFile := LoadDefaultConfigFile(buffer) configFile := LoadDefaultConfigFile(buffer)

2
cli/config/configfile/file.go
View File

@ -139,7 +139,7 @@ func (configFile *ConfigFile) Save() (retErr error) {
} }
dir := filepath.Dir(configFile.Filename) dir := filepath.Dir(configFile.Filename)
if err := os.MkdirAll(dir, 0700); err != nil { if err := os.MkdirAll(dir, 0o700); err != nil {
return err return err
} }
temp, err := os.CreateTemp(dir, filepath.Base(configFile.Filename)) temp, err := os.CreateTemp(dir, filepath.Base(configFile.Filename))

2
cli/config/configfile/file_unix.go
View File

@ -12,7 +12,7 @@ import (
// ignoring any error during the process. // ignoring any error during the process.
func copyFilePermissions(src, dst string) { func copyFilePermissions(src, dst string) {
var ( var (
mode os.FileMode = 0600 mode os.FileMode = 0o600
uid, gid int uid, gid int
) )

4
cli/context/store/metadatastore.go
View File

@ -28,14 +28,14 @@ func (s *metadataStore) contextDir(id contextdir) string {
func (s *metadataStore) createOrUpdate(meta Metadata) error { func (s *metadataStore) createOrUpdate(meta Metadata) error {
contextDir := s.contextDir(contextdirOf(meta.Name)) contextDir := s.contextDir(contextdirOf(meta.Name))
if err := os.MkdirAll(contextDir, 0755); err != nil { if err := os.MkdirAll(contextDir, 0o755); err != nil {
return err return err
} }
bytes, err := json.Marshal(&meta) bytes, err := json.Marshal(&meta)
if err != nil { if err != nil {
return err return err
} }
return os.WriteFile(filepath.Join(contextDir, metaFile), bytes, 0644) return os.WriteFile(filepath.Join(contextDir, metaFile), bytes, 0o644)
} }
func parseTypedOrMap(payload []byte, getter TypeGetter) (interface{}, error) { func parseTypedOrMap(payload []byte, getter TypeGetter) (interface{}, error) {

8
cli/context/store/store.go
View File

@ -246,7 +246,7 @@ func Export(name string, s Reader) io.ReadCloser {
} }
if err = tw.WriteHeader(&tar.Header{ if err = tw.WriteHeader(&tar.Header{
Name: metaFile, Name: metaFile,
Mode: 0644, Mode: 0o644,
Size: int64(len(metaBytes)), Size: int64(len(metaBytes)),
}); err != nil { }); err != nil {
writer.CloseWithError(err) writer.CloseWithError(err)
@ -263,7 +263,7 @@ func Export(name string, s Reader) io.ReadCloser {
} }
if err = tw.WriteHeader(&tar.Header{ if err = tw.WriteHeader(&tar.Header{
Name: "tls", Name: "tls",
Mode: 0700, Mode: 0o700,
Size: 0, Size: 0,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
}); err != nil { }); err != nil {
@ -273,7 +273,7 @@ func Export(name string, s Reader) io.ReadCloser {
for endpointName, endpointFiles := range tlsFiles { for endpointName, endpointFiles := range tlsFiles {
if err = tw.WriteHeader(&tar.Header{ if err = tw.WriteHeader(&tar.Header{
Name: path.Join("tls", endpointName), Name: path.Join("tls", endpointName),
Mode: 0700, Mode: 0o700,
Size: 0, Size: 0,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
}); err != nil { }); err != nil {
@ -288,7 +288,7 @@ func Export(name string, s Reader) io.ReadCloser {
} }
if err = tw.WriteHeader(&tar.Header{ if err = tw.WriteHeader(&tar.Header{
Name: path.Join("tls", endpointName, fileName), Name: path.Join("tls", endpointName, fileName),
Mode: 0600, Mode: 0o600,
Size: int64(len(data)), Size: int64(len(data)),
}); err != nil { }); err != nil {
writer.CloseWithError(err) writer.CloseWithError(err)

2
cli/context/store/store_test.go
View File

@ -139,7 +139,7 @@ func TestImportTarInvalid(t *testing.T) {
tw := tar.NewWriter(f) tw := tar.NewWriter(f)
hdr := &tar.Header{ hdr := &tar.Header{
Name: "dummy-file", Name: "dummy-file",
Mode: 0600, Mode: 0o600,
Size: int64(len("hello world")), Size: int64(len("hello world")),
} }
err = tw.WriteHeader(hdr) err = tw.WriteHeader(hdr)

6
cli/context/store/tlsstore.go
View File

@ -24,14 +24,14 @@ func (s *tlsStore) endpointDir(name, endpointName string) string {
func (s *tlsStore) createOrUpdate(name, endpointName, filename string, data []byte) error { func (s *tlsStore) createOrUpdate(name, endpointName, filename string, data []byte) error {
parentOfRoot := filepath.Dir(s.root) parentOfRoot := filepath.Dir(s.root)
if err := os.MkdirAll(parentOfRoot, 0755); err != nil { if err := os.MkdirAll(parentOfRoot, 0o755); err != nil {
return err return err
} }
endpointDir := s.endpointDir(name, endpointName) endpointDir := s.endpointDir(name, endpointName)
if err := os.MkdirAll(endpointDir, 0700); err != nil { if err := os.MkdirAll(endpointDir, 0o700); err != nil {
return err return err
} }
return os.WriteFile(filepath.Join(endpointDir, filename), data, 0600) return os.WriteFile(filepath.Join(endpointDir, filename), data, 0o600)
} }
func (s *tlsStore) getData(name, endpointName, filename string) ([]byte, error) { func (s *tlsStore) getData(name, endpointName, filename string) ([]byte, error) {

4
cli/manifest/store/store.go
View File

@ -136,12 +136,12 @@ func (s *fsStore) Save(listRef reference.Reference, manifest reference.Reference
if err != nil { if err != nil {
return err return err
} }
return os.WriteFile(filename, bytes, 0644) return os.WriteFile(filename, bytes, 0o644)
} }
func (s *fsStore) createManifestListDirectory(transaction string) error { func (s *fsStore) createManifestListDirectory(transaction string) error {
path := filepath.Join(s.root, makeFilesafeName(transaction)) path := filepath.Join(s.root, makeFilesafeName(transaction))
return os.MkdirAll(path, 0755) return os.MkdirAll(path, 0o755)
} }
func manifestToFilename(root, manifestList, manifest string) string { func manifestToFilename(root, manifestList, manifest string) string {

8
cmd/docker/builder_test.go
View File

@ -23,7 +23,7 @@ func init() {
func TestBuildWithBuilder(t *testing.T) { func TestBuildWithBuilder(t *testing.T) {
dir := fs.NewDir(t, t.Name(), dir := fs.NewDir(t, t.Name(),
fs.WithFile(pluginFilename, `#!/bin/sh fs.WithFile(pluginFilename, `#!/bin/sh
echo '{"SchemaVersion":"0.1.0","Vendor":"Docker Inc.","Version":"v0.6.3","ShortDescription":"Build with BuildKit"}'`, fs.WithMode(0777)), echo '{"SchemaVersion":"0.1.0","Vendor":"Docker Inc.","Version":"v0.6.3","ShortDescription":"Build with BuildKit"}'`, fs.WithMode(0o777)),
) )
defer dir.Remove() defer dir.Remove()
@ -47,7 +47,7 @@ func TestBuildkitDisabled(t *testing.T) {
t.Setenv("DOCKER_BUILDKIT", "0") t.Setenv("DOCKER_BUILDKIT", "0")
dir := fs.NewDir(t, t.Name(), dir := fs.NewDir(t, t.Name(),
fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0777)), fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0o777)),
) )
defer dir.Remove() defer dir.Remove()
@ -74,7 +74,7 @@ func TestBuildkitDisabled(t *testing.T) {
func TestBuilderBroken(t *testing.T) { func TestBuilderBroken(t *testing.T) {
dir := fs.NewDir(t, t.Name(), dir := fs.NewDir(t, t.Name(),
fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0777)), fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0o777)),
) )
defer dir.Remove() defer dir.Remove()
@ -104,7 +104,7 @@ func TestBuilderBrokenEnforced(t *testing.T) {
t.Setenv("DOCKER_BUILDKIT", "1") t.Setenv("DOCKER_BUILDKIT", "1")
dir := fs.NewDir(t, t.Name(), dir := fs.NewDir(t, t.Name(),
fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0777)), fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0o777)),
) )
defer dir.Remove() defer dir.Remove()

2
docker.Makefile
View File

@ -76,7 +76,7 @@ shellcheck: ## run shellcheck validation
docker buildx bake shellcheck docker buildx bake shellcheck
.PHONY: fmt .PHONY: fmt
fmt: ## run gofmt fmt: ## run gofumpt
$(DOCKER_RUN) $(DEV_DOCKER_IMAGE_NAME) make fmt $(DOCKER_RUN) $(DEV_DOCKER_IMAGE_NAME) make fmt
.PHONY: vendor .PHONY: vendor

9
dockerfiles/Dockerfile.dev
View File

@ -8,6 +8,14 @@ FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx
FROM golang:${GO_VERSION}-alpine AS golang FROM golang:${GO_VERSION}-alpine AS golang
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0
FROM golang AS gofumpt
ARG GOFUMPT_VERSION=v0.4.0
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
--mount=type=tmpfs,target=/go/src/ \
GO111MODULE=on go install "mvdan.cc/gofumpt@${GOFUMPT_VERSION}" \
&& gofumpt --version
FROM golang AS gotestsum FROM golang AS gotestsum
ARG GOTESTSUM_VERSION=v0.4.0 ARG GOTESTSUM_VERSION=v0.4.0
RUN --mount=type=cache,target=/root/.cache/go-build \ RUN --mount=type=cache,target=/root/.cache/go-build \
@ -40,6 +48,7 @@ ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
ENV PATH=$PATH:/go/src/github.com/docker/cli/build ENV PATH=$PATH:/go/src/github.com/docker/cli/build
COPY --from=buildx /buildx /usr/libexec/docker/cli-plugins/docker-buildx COPY --from=buildx /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=gofumpt /go/bin/* /go/bin/
COPY --from=gotestsum /go/bin/* /go/bin/ COPY --from=gotestsum /go/bin/* /go/bin/
COPY --from=goversioninfo /go/bin/* /go/bin/ COPY --from=goversioninfo /go/bin/* /go/bin/

2
e2e/image/build_test.go
View File

@ -21,7 +21,7 @@ func TestBuildFromContextDirectoryWithTag(t *testing.T) {
t.Setenv("DOCKER_BUILDKIT", "0") t.Setenv("DOCKER_BUILDKIT", "0")
dir := fs.NewDir(t, "test-build-context-dir", dir := fs.NewDir(t, "test-build-context-dir",
fs.WithFile("run", "echo running", fs.WithMode(0755)), fs.WithFile("run", "echo running", fs.WithMode(0o755)),
fs.WithDir("data", fs.WithFile("one", "1111")), fs.WithDir("data", fs.WithFile("one", "1111")),
fs.WithFile("Dockerfile", fmt.Sprintf(` fs.WithFile("Dockerfile", fmt.Sprintf(`
FROM %s FROM %s

2
e2e/image/push_test.go
View File

@ -406,7 +406,7 @@ func notaryListTargetsInRole(t *testing.T, notaryDir, homeDir *fs.Dir, baseRef,
} }
func setupNotaryConfig(t *testing.T, dockerConfigDir fs.Dir) *fs.Dir { func setupNotaryConfig(t *testing.T, dockerConfigDir fs.Dir) *fs.Dir {
return fs.NewDir(t, "notary_test", fs.WithMode(0700), return fs.NewDir(t, "notary_test", fs.WithMode(0o700),
fs.WithFile("client-config.json", fmt.Sprintf(` fs.WithFile("client-config.json", fmt.Sprintf(`
{ {
"trust_dir": "%s", "trust_dir": "%s",

2
e2e/internal/fixtures/fixtures.go
View File

@ -34,7 +34,7 @@ func SetupConfigFile(t *testing.T) fs.Dir {
// with the given notaryURL // with the given notaryURL
func SetupConfigWithNotaryURL(t *testing.T, path, notaryURL string) fs.Dir { func SetupConfigWithNotaryURL(t *testing.T, path, notaryURL string) fs.Dir {
t.Helper() t.Helper()
dir := fs.NewDir(t, path, fs.WithMode(0700), fs.WithFile("config.json", fmt.Sprintf(` dir := fs.NewDir(t, path, fs.WithMode(0o700), fs.WithFile("config.json", fmt.Sprintf(`
{ {
"auths": { "auths": {
"registry:5000": { "registry:5000": {

2
e2e/plugin/basic/basic.go
View File

@ -14,7 +14,7 @@ func main() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
if err := os.MkdirAll(p, 0755); err != nil { if err := os.MkdirAll(p, 0o755); err != nil {
panic(err) panic(err)
} }
l, err := net.Listen("unix", filepath.Join(p, "basic.sock")) l, err := net.Listen("unix", filepath.Join(p, "basic.sock"))

4
e2e/plugin/trust_test.go
View File

@ -86,8 +86,8 @@ func preparePluginDir(t *testing.T) *fs.Dir {
assert.NilError(t, err) assert.NilError(t, err)
dir := fs.NewDir(t, "plugin_test", dir := fs.NewDir(t, "plugin_test",
fs.WithFile("config.json", string(configJSON), fs.WithMode(0644)), fs.WithFile("config.json", string(configJSON), fs.WithMode(0o644)),
fs.WithDir("rootfs", fs.WithMode(0755)), fs.WithDir("rootfs", fs.WithMode(0o755)),
) )
icmd.RunCommand("/bin/cp", binPath, dir.Join("rootfs", p.Entrypoint[0])).Assert(t, icmd.Success) icmd.RunCommand("/bin/cp", binPath, dir.Join("rootfs", p.Entrypoint[0])).Assert(t, icmd.Success)
return dir return dir

2
opts/config.go
View File

@ -27,7 +27,7 @@ func (o *ConfigOpt) Set(value string) error {
File: &swarmtypes.ConfigReferenceFileTarget{ File: &swarmtypes.ConfigReferenceFileTarget{
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
} }

2
opts/config_test.go
View File

@ -59,7 +59,7 @@ func TestConfigOptions(t *testing.T) {
fileName: "testing", fileName: "testing",
uid: "1000", uid: "1000",
gid: "1001", gid: "1001",
fileMode: 0444, fileMode: 0o444,
}, },
} }

2
opts/mount_test.go
View File

@ -205,7 +205,7 @@ func TestMountOptSetTmpfsNoError(t *testing.T) {
Target: "/target", Target: "/target",
TmpfsOptions: &mounttypes.TmpfsOptions{ TmpfsOptions: &mounttypes.TmpfsOptions{
SizeBytes: 1024 * 1024, // not 1000 * 1000 SizeBytes: 1024 * 1024, // not 1000 * 1000
Mode: os.FileMode(0700), Mode: os.FileMode(0o700),
}, },
}, mounts[0])) }, mounts[0]))
} }

2
opts/secret.go
View File

@ -27,7 +27,7 @@ func (o *SecretOpt) Set(value string) error {
File: &swarmtypes.SecretReferenceFileTarget{ File: &swarmtypes.SecretReferenceFileTarget{
UID: "0", UID: "0",
GID: "0", GID: "0",
Mode: 0444, Mode: 0o444,
}, },
} }

2
opts/secret_test.go
View File

@ -59,7 +59,7 @@ func TestSecretOptions(t *testing.T) {
fileName: "testing", fileName: "testing",
uid: "1000", uid: "1000",
gid: "1001", gid: "1001",
fileMode: 0444, fileMode: 0o444,
}, },
} }