From 616bba0afddb75c18931c24ebe44a1ddb158e989 Mon Sep 17 00:00:00 2001 From: kimdcottrell Date: Sat, 28 Oct 2023 15:19:39 -0400 Subject: [PATCH] linter errors fixed Signed-off-by: kimdcottrell --- pkg/compose/create.go | 5 +++-- pkg/e2e/watch_test.go | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/compose/create.go b/pkg/compose/create.go index bdda20f32..b7c4505e7 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -1131,11 +1131,12 @@ func (s *composeService) resolveExternalNetwork(ctx context.Context, n *types.Ne if len(networks) == 0 { // in this instance, n.Name is really an ID - network, err := s.apiClient().NetworkInspect(ctx, n.Name, moby.NetworkInspectOptions{}) - networks = append(networks, network) + sn, err := s.apiClient().NetworkInspect(ctx, n.Name, moby.NetworkInspectOptions{}) if err != nil { 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 diff --git a/pkg/e2e/watch_test.go b/pkg/e2e/watch_test.go index 1ae1814d9..2fabd1bac 100644 --- a/pkg/e2e/watch_test.go +++ b/pkg/e2e/watch_test.go @@ -80,8 +80,9 @@ func TestRebuildOnDotEnvWithExternalNetwork(t *testing.T) { assert.Assert(t, !strings.Contains(res.Combined(), projectName), res.Combined()) t.Log("create a dotenv file that will be used to trigger the rebuild") - os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD"), 0666) - _, err := os.ReadFile(dotEnvFilepath) + err := os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD"), 0o666) + assert.NilError(t, err) + _, err = os.ReadFile(dotEnvFilepath) assert.NilError(t, err) // TODO: refactor this duplicated code into frameworks? Maybe? @@ -114,7 +115,8 @@ func TestRebuildOnDotEnvWithExternalNetwork(t *testing.T) { assert.Equal(t, pn.Stdout(), n.Stdout()) 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) assert.NilError(t, err)