tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linter errors fixed 

Signed-off-by: kimdcottrell <me@kimdcottrell.com>
This commit is contained in:
kimdcottrell 2023-10-28 15:19:39 -04:00 committed by Nicolas De loof
parent ee6e3c2a44
commit 616bba0afd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/compose/create.go
View File

@ -1131,11 +1131,12 @@ func (s *composeService) resolveExternalNetwork(ctx context.Context, n *types.Ne
if len(networks) == 0 { if len(networks) == 0 {
// in this instance, n.Name is really an ID // in this instance, n.Name is really an ID
network, err := s.apiClient().NetworkInspect(ctx, n.Name, moby.NetworkInspectOptions{}) sn, err := s.apiClient().NetworkInspect(ctx, n.Name, moby.NetworkInspectOptions{})
networks = append(networks, network)
if err != nil { if err != nil {
return err return err
} }
networks = append(networks, sn)
} }
// NetworkList API doesn't return the exact name match, so we can retrieve more than one network with a request // NetworkList API doesn't return the exact name match, so we can retrieve more than one network with a request

8
pkg/e2e/watch_test.go
View File

@ -80,8 +80,9 @@ func TestRebuildOnDotEnvWithExternalNetwork(t *testing.T) {
assert.Assert(t, !strings.Contains(res.Combined(), projectName), res.Combined()) assert.Assert(t, !strings.Contains(res.Combined(), projectName), res.Combined())
t.Log("create a dotenv file that will be used to trigger the rebuild") t.Log("create a dotenv file that will be used to trigger the rebuild")
os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD"), 0666) err := os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD"), 0o666)
_, err := os.ReadFile(dotEnvFilepath) assert.NilError(t, err)
_, err = os.ReadFile(dotEnvFilepath)
assert.NilError(t, err) assert.NilError(t, err)
// TODO: refactor this duplicated code into frameworks? Maybe? // TODO: refactor this duplicated code into frameworks? Maybe?
@ -114,7 +115,8 @@ func TestRebuildOnDotEnvWithExternalNetwork(t *testing.T) {
assert.Equal(t, pn.Stdout(), n.Stdout()) assert.Equal(t, pn.Stdout(), n.Stdout())
t.Log("create a dotenv file that will be used to trigger the rebuild") t.Log("create a dotenv file that will be used to trigger the rebuild")
os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD\nTEST=REBUILD"), 0666) err = os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD\nTEST=REBUILD"), 0o666)
assert.NilError(t, err)
_, err = os.ReadFile(dotEnvFilepath) _, err = os.ReadFile(dotEnvFilepath)
assert.NilError(t, err) assert.NilError(t, err)