linter errors fixed

kimdcottrell · kimdcottrell · commit 0572e07e03df · 2023-10-28T15:19:39.000-04:00
Signed-off-by: kimdcottrell &lt;me@kimdcottrell.com&gt;
diff --git 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
@@ -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)
 

Original file line number	Diff line number	Diff line change
`@@ -1131,11 +1131,12 @@ func (s composeService) resolveExternalNetwork(ctx context.Context, n types.Ne`
`1131`	`1131`
`1132`	`1132`	`if len(networks) == 0 {`
`1133`	`1133`	`// in this instance, n.Name is really an ID`
`1134`		`- network, err := s.apiClient().NetworkInspect(ctx, n.Name, moby.NetworkInspectOptions{})`
`1135`		`- networks = append(networks, network)`
	`1134`	`+ sn, err := s.apiClient().NetworkInspect(ctx, n.Name, moby.NetworkInspectOptions{})`
`1136`	`1135`	`if err != nil {`
`1137`	`1136`	`return err`
`1138`	`1137`	`}`
	`1138`	`+ networks = append(networks, sn)`
	`1139`	`+`
`1139`	`1140`	`}`
`1140`	`1141`
`1141`	`1142`	`// NetworkList API doesn't return the exact name match, so we can retrieve more than one network with a request`