浏览代码

fix: lint

Signed-off-by: MohammadHasan Akbari <[email protected]>
Signed-off-by: MohammadHasan Akbari <[email protected]>
MohammadHasan Akbari 1 年之前
父节点
当前提交
bf0418bac1
共有 2 个文件被更改,包括 33 次插入25 次删除
  1. 12 3
      pkg/compose/export.go
  2. 21 22
      pkg/e2e/export_test.go

+ 12 - 3
pkg/compose/export.go

@@ -69,15 +69,24 @@ func (s *composeService) export(ctx context.Context, projectName string, options
 		return err
 	}
 
-	defer responseBody.Close()
+	defer func() {
+		if err := responseBody.Close(); err != nil {
+			w.Event(progress.Event{
+				ID:         name,
+				Text:       msg,
+				Status:     progress.Error,
+				StatusText: fmt.Sprintf("Failed to close response body: %v", err),
+			})
+		}
+	}()
 
 	if !s.dryRun {
 		if options.Output == "" {
 			_, err := io.Copy(s.dockerCli.Out(), responseBody)
 			return err
 		}
-	
-		if err = command.CopyToFile(options.Output, responseBody); err != nil {
+
+		if err := command.CopyToFile(options.Output, responseBody); err != nil {
 			return err
 		}
 	}

+ 21 - 22
pkg/e2e/export_test.go

@@ -21,31 +21,30 @@ import (
 )
 
 func TestExport(t *testing.T) {
-    const projectName = "e2e-export-service"
-    c := NewParallelCLI(t)
+	const projectName = "e2e-export-service"
+	c := NewParallelCLI(t)
 
-    cleanup := func() {
-        c.RunDockerComposeCmd(t, "--project-name", projectName, "down", "--timeout=0", "--remove-orphans")
-    }
-    t.Cleanup(cleanup)
-    cleanup()
+	cleanup := func() {
+		c.RunDockerComposeCmd(t, "--project-name", projectName, "down", "--timeout=0", "--remove-orphans")
+	}
+	t.Cleanup(cleanup)
+	cleanup()
 
-    c.RunDockerComposeCmd(t, "-f", "./fixtures/export/compose.yaml", "--project-name", projectName, "up", "-d", "service")
-    c.RunDockerComposeCmd(t, "--project-name", projectName, "export", "-o", "service.tar", "service")
+	c.RunDockerComposeCmd(t, "-f", "./fixtures/export/compose.yaml", "--project-name", projectName, "up", "-d", "service")
+	c.RunDockerComposeCmd(t, "--project-name", projectName, "export", "-o", "service.tar", "service")
 }
 
 func TestExportWithReplicas(t *testing.T) {
-    const projectName = "e2e-export-service-with-replicas"
-    c := NewParallelCLI(t)
-
-    cleanup := func() {
-        c.RunDockerComposeCmd(t, "--project-name", projectName, "down", "--timeout=0", "--remove-orphans")
-    }
-    t.Cleanup(cleanup)
-    cleanup()
-
-    c.RunDockerComposeCmd(t, "-f", "./fixtures/export/compose.yaml", "--project-name", projectName, "up", "-d", "service-with-replicas")
-    c.RunDockerComposeCmd(t, "--project-name", projectName, "export", "-o", "r1.tar", "--index=1", "service-with-replicas")
-    c.RunDockerComposeCmd(t, "--project-name", projectName, "export", "-o", "r2.tar", "--index=2", "service-with-replicas")
+	const projectName = "e2e-export-service-with-replicas"
+	c := NewParallelCLI(t)
+
+	cleanup := func() {
+		c.RunDockerComposeCmd(t, "--project-name", projectName, "down", "--timeout=0", "--remove-orphans")
+	}
+	t.Cleanup(cleanup)
+	cleanup()
+
+	c.RunDockerComposeCmd(t, "-f", "./fixtures/export/compose.yaml", "--project-name", projectName, "up", "-d", "service-with-replicas")
+	c.RunDockerComposeCmd(t, "--project-name", projectName, "export", "-o", "r1.tar", "--index=1", "service-with-replicas")
+	c.RunDockerComposeCmd(t, "--project-name", projectName, "export", "-o", "r2.tar", "--index=2", "service-with-replicas")
 }
-