github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

services/server: gofumpt

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-11-15 13:05:22 +01:00
parent 7deb68fbf4
commit 14e621cf91
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/server/config/config_test.go
View File

@ -86,7 +86,7 @@ func TestResolveImports(t *testing.T) {
tempDir := t.TempDir() tempDir := t.TempDir()
for _, filename := range []string{"config_1.toml", "config_2.toml", "test.toml"} { for _, filename := range []string{"config_1.toml", "config_2.toml", "test.toml"} {
err := os.WriteFile(filepath.Join(tempDir, filename), []byte(""), 0600) err := os.WriteFile(filepath.Join(tempDir, filename), []byte(""), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -118,7 +118,7 @@ root = "/var/lib/containerd"
tempDir := t.TempDir() tempDir := t.TempDir()
path := filepath.Join(tempDir, "config.toml") path := filepath.Join(tempDir, "config.toml")
err := os.WriteFile(path, []byte(data), 0600) err := os.WriteFile(path, []byte(data), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
var out Config var out Config
@ -147,10 +147,10 @@ disabled_plugins = ["io.containerd.v1.xyz"]
tempDir := t.TempDir() tempDir := t.TempDir()
err := os.WriteFile(filepath.Join(tempDir, "data1.toml"), []byte(data1), 0600) err := os.WriteFile(filepath.Join(tempDir, "data1.toml"), []byte(data1), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
err = os.WriteFile(filepath.Join(tempDir, "data2.toml"), []byte(data2), 0600) err = os.WriteFile(filepath.Join(tempDir, "data2.toml"), []byte(data2), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
var out Config var out Config
@ -175,10 +175,10 @@ imports = ["data1.toml", "data2.toml"]
` `
tempDir := t.TempDir() tempDir := t.TempDir()
err := os.WriteFile(filepath.Join(tempDir, "data1.toml"), []byte(data1), 0600) err := os.WriteFile(filepath.Join(tempDir, "data1.toml"), []byte(data1), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
err = os.WriteFile(filepath.Join(tempDir, "data2.toml"), []byte(data2), 0600) err = os.WriteFile(filepath.Join(tempDir, "data2.toml"), []byte(data2), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
var out Config var out Config
@ -207,7 +207,7 @@ version = 2
tempDir := t.TempDir() tempDir := t.TempDir()
path := filepath.Join(tempDir, "config.toml") path := filepath.Join(tempDir, "config.toml")
err := os.WriteFile(path, []byte(data), 0600) err := os.WriteFile(path, []byte(data), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
var out Config var out Config
@ -230,7 +230,7 @@ func TestDecodePluginInV1Config(t *testing.T) {
` `
path := filepath.Join(t.TempDir(), "config.toml") path := filepath.Join(t.TempDir(), "config.toml")
err := os.WriteFile(path, []byte(data), 0600) err := os.WriteFile(path, []byte(data), 0o600)
assert.NoError(t, err) assert.NoError(t, err)
var out Config var out Config

6
services/server/server.go
View File

@ -81,16 +81,16 @@ func CreateTopLevelDirectories(config *srvconfig.Config) error {
return errors.New("root and state must be different paths") return errors.New("root and state must be different paths")
} }
if err := sys.MkdirAllWithACL(config.Root, 0711); err != nil { if err := sys.MkdirAllWithACL(config.Root, 0o711); err != nil {
return err return err
} }
if err := sys.MkdirAllWithACL(config.State, 0711); err != nil { if err := sys.MkdirAllWithACL(config.State, 0o711); err != nil {
return err return err
} }
if config.TempDir != "" { if config.TempDir != "" {
if err := sys.MkdirAllWithACL(config.TempDir, 0711); err != nil { if err := sys.MkdirAllWithACL(config.TempDir, 0o711); err != nil {
return err return err
} }
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {