Skip to content

Commit b77573f

Browse files
author
Jess Frazelle
committed
Merge pull request moby#21274 from jfrazelle/fix-variables-that-werent-being-used
fix variables that werent being called
2 parents 131c591 + 0e025b4 commit b77573f

15 files changed

Lines changed: 40 additions & 34 deletions

File tree

‎api/server/router/container/exec.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ func (s *containerRouter) postContainerExecStart(ctx context.Context, w http.Res
103103
stderr = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
104104
stdout = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
105105
}
106-
} else {
107-
outStream = w
108106
}
109107

110108
// Now run the user process in container.

‎builder/dockerfile/builder.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ func sanitizeRepoAndTags(names []string) ([]reference.Named, error) {
142142

143143
if _, isTagged := ref.(reference.NamedTagged); !isTagged {
144144
ref, err = reference.WithTag(ref, reference.DefaultTag)
145+
if err != nil {
146+
return nil, err
147+
}
145148
}
146149

147150
nameWithTag := ref.String()

‎builder/dockerfile/parser/parser.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func Parse(rwc io.Reader) (*Node, error) {
136136
}
137137
}
138138
if child == nil && line != "" {
139-
line, child, err = parseLine(line)
139+
_, child, err = parseLine(line)
140140
if err != nil {
141141
return nil, err
142142
}

‎cliconfig/config_test.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,14 @@ func TestJsonWithPsFormat(t *testing.T) {
378378

379379
// Save it and make sure it shows up in new form
380380
func saveConfigAndValidateNewFormat(t *testing.T, config *ConfigFile, homeFolder string) string {
381-
err := config.Save()
382-
if err != nil {
381+
if err := config.Save(); err != nil {
383382
t.Fatalf("Failed to save: %q", err)
384383
}
385384

386385
buf, err := ioutil.ReadFile(filepath.Join(homeFolder, ConfigFileName))
386+
if err != nil {
387+
t.Fatal(err)
388+
}
387389
if !strings.Contains(string(buf), `"auths":`) {
388390
t.Fatalf("Should have save in new form: %s", string(buf))
389391
}
@@ -487,6 +489,9 @@ func TestJsonSaveWithNoFile(t *testing.T) {
487489
t.Fatalf("Failed saving to file: %q", err)
488490
}
489491
buf, err := ioutil.ReadFile(filepath.Join(tmpHome, ConfigFileName))
492+
if err != nil {
493+
t.Fatal(err)
494+
}
490495
expConfStr := `{
491496
"auths": {
492497
"https://index.docker.io/v1/": {
@@ -517,11 +522,13 @@ func TestLegacyJsonSaveWithNoFile(t *testing.T) {
517522

518523
fn := filepath.Join(tmpHome, ConfigFileName)
519524
f, _ := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
520-
err = config.SaveToWriter(f)
521-
if err != nil {
525+
if err = config.SaveToWriter(f); err != nil {
522526
t.Fatalf("Failed saving to file: %q", err)
523527
}
524528
buf, err := ioutil.ReadFile(filepath.Join(tmpHome, ConfigFileName))
529+
if err != nil {
530+
t.Fatal(err)
531+
}
525532

526533
expConfStr := `{
527534
"auths": {

‎daemon/daemon_unix.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,6 @@ func parseRemappedRoot(usergrp string) (string, string, error) {
883883
}
884884
return "", "", fmt.Errorf("Error during %q user creation: %v", defaultRemappedID, err)
885885
}
886-
userID = luser.Uid
887886
username = luser.Name
888887
if len(idparts) == 1 {
889888
// we only have a string username, and no group specified; look up gid from username as group
@@ -909,11 +908,9 @@ func parseRemappedRoot(usergrp string) (string, string, error) {
909908
groupname = lgrp.Name
910909
} else {
911910
// not a number; attempt a lookup
912-
group, err := user.LookupGroup(idparts[1])
913-
if err != nil {
914-
return "", "", fmt.Errorf("Error during gid lookup for %q: %v", idparts[1], err)
911+
if _, err := user.LookupGroup(idparts[1]); err != nil {
912+
return "", "", fmt.Errorf("Error during groupname lookup for %q: %v", idparts[1], err)
915913
}
916-
groupID = group.Gid
917914
groupname = idparts[1]
918915
}
919916
}

‎daemon/graphdriver/overlay/overlay.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,10 @@ func (d *Driver) Get(id string, mountLabel string) (string, error) {
371371
// chown "workdir/work" to the remapped root UID/GID. Overlay fs inside a
372372
// user namespace requires this to move a directory from lower to upper.
373373
rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
374+
if err != nil {
375+
return "", err
376+
}
377+
374378
if err := os.Chown(path.Join(workDir, "work"), rootUID, rootGID); err != nil {
375379
return "", err
376380
}

‎pkg/authorization/authz_unix_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func (t *authZPluginTestServer) start() {
241241
r.HandleFunc("/Plugin.Activate", t.activate)
242242
r.HandleFunc("/"+AuthZApiRequest, t.auth)
243243
r.HandleFunc("/"+AuthZApiResponse, t.auth)
244-
t.listener, err = net.Listen("tcp", pluginAddress)
244+
t.listener, _ = net.Listen("tcp", pluginAddress)
245245
server := http.Server{Handler: r, Addr: pluginAddress}
246246
server.Serve(l)
247247
}

‎pkg/directory/directory_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ func TestMoveToSubdir(t *testing.T) {
168168
}
169169
// validate that the files were moved to the subdirectory
170170
infos, err := ioutil.ReadDir(subDir)
171+
if err != nil {
172+
t.Fatal(err)
173+
}
171174
if len(infos) != 4 {
172175
t.Fatalf("Should be four files in the subdir after the migration: actual length: %d", len(infos))
173176
}

‎pkg/directory/directory_windows.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@ package directory
55
import (
66
"os"
77
"path/filepath"
8-
9-
"github.com/docker/docker/pkg/longpath"
108
)
119

1210
// Size walks a directory tree and returns its total size in bytes.
1311
func Size(dir string) (size int64, err error) {
14-
fixedPath, err := filepath.Abs(dir)
15-
if err != nil {
16-
return
17-
}
18-
fixedPath = longpath.AddPrefix(fixedPath)
1912
err = filepath.Walk(dir, func(d string, fileInfo os.FileInfo, e error) error {
2013
// Ignore directory sizes
2114
if fileInfo == nil {

‎pkg/jsonlog/jsonlog_marshalling.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,15 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
9393
ffjsonWriteJSONString(buf, mj.Log)
9494
}
9595
if len(mj.Stream) != 0 {
96-
if first == true {
96+
if first {
9797
first = false
9898
} else {
9999
buf.WriteString(`,`)
100100
}
101101
buf.WriteString(`"stream":`)
102102
ffjsonWriteJSONString(buf, mj.Stream)
103103
}
104-
if first == true {
105-
first = false
106-
} else {
104+
if !first {
107105
buf.WriteString(`,`)
108106
}
109107
buf.WriteString(`"time":`)

0 commit comments

Comments
 (0)