Fix bugs, resource leaks, and test issues in cmd/desync

cmd/desync/cat.go

@@ -60,10 +60,12 @@ func runCat(ctx context.Context, opt catOptions, args []string) error {
 	)
 	if len(args) == 2 {
 		outFileName := args[1]
-		outFile, err = os.Create(outFileName)
+		f, err := os.Create(outFileName)
 		if err != nil {
 			return err
 		}
+		defer f.Close()
+		outFile = f
 	} else {
 		outFile = stdout
 	}

cmd/desync/chunkserver.go

@@ -157,7 +157,7 @@ func runChunkServer(ctx context.Context, opt chunkServerOptions, args []string)
 // Wrapper for http.HandlerFunc to add logging for requests (and response codes)
 func withLog(h http.Handler, log *log.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		lrw := &loggingResponseWriter{ResponseWriter: w}
+		lrw := &loggingResponseWriter{ResponseWriter: w, statusCode: http.StatusOK}
 		h.ServeHTTP(lrw, r)
 		log.Printf("Client: %s, Request: %s %s, Response: %d", r.RemoteAddr, r.Method, r.RequestURI, lrw.statusCode)
 	}
@@ -178,7 +178,7 @@ func chunkServerStore(opt chunkServerOptions) (desync.Store, error) {
 		}
 		stores, cache, err = readStoreFile(opt.storeFile)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to read store-file '%s'", err)
+			return nil, errors.Wrapf(err, "failed to read store-file '%s'", opt.storeFile)
 		}
 	}
 

cmd/desync/chunkserver_test.go

@@ -173,8 +173,9 @@ func startChunkServer(t *testing.T, args ...string) (string, context.CancelFunc)
 	cmd := newChunkServerCommand(ctx)
 	cmd.SetArgs(append(args, "-l", addr))
 	go func() {
-		_, err = cmd.ExecuteC()
-		require.NoError(t, err)
+		if _, err := cmd.ExecuteC(); err != nil && ctx.Err() == nil {
+			t.Errorf("chunk server error: %v", err)
+		}
 	}()
 
 	// Wait a little for the server to start

cmd/desync/config.go

@@ -120,7 +120,7 @@ func runConfig(ctx context.Context, write bool) error {
 	if err != nil {
 		return err
 	}
-	var w io.Writer = os.Stderr
+	var w io.Writer = os.Stdout
 	if write {
 		if err = os.MkdirAll(filepath.Dir(cfgFile), 0755); err != nil {
 			return err

cmd/desync/indexserver_test.go

@@ -83,8 +83,9 @@ func startIndexServer(t *testing.T, args ...string) (string, context.CancelFunc)
 	cmd := newIndexServerCommand(ctx)
 	cmd.SetArgs(append(args, "-l", addr))
 	go func() {
-		_, err = cmd.ExecuteC()
-		require.NoError(t, err)
+		if _, err := cmd.ExecuteC(); err != nil && ctx.Err() == nil {
+			t.Errorf("index server error: %v", err)
+		}
 	}()
 
 	// Wait a little for the server to start

cmd/desync/info.go

@@ -242,7 +242,7 @@ func runInfo(ctx context.Context, opt infoOptions, args []string) error {
 		fmt.Println("Chunk size avg:", results.ChunkSizeAvg)
 		fmt.Println("Chunk size max:", results.ChunkSizeMax)
 	default:
-		return fmt.Errorf("unsupported output format '%s", opt.printFormat)
+		return fmt.Errorf("unsupported output format %q", opt.printFormat)
 	}
 	return nil
 }

cmd/desync/inspectchunks.go

@@ -48,10 +48,12 @@ func runInspectChunks(ctx context.Context, opt inspectChunksOptions, args []stri
 	)
 	if len(args) == 2 {
 		outFileName := args[1]
-		outFile, err = os.Create(outFileName)
+		f, err := os.Create(outFileName)
 		if err != nil {
 			return err
 		}
+		defer f.Close()
+		outFile = f
 	} else {
 		outFile = stdout
 	}

cmd/desync/mount-index.go

@@ -157,7 +157,7 @@ func mountIndexStore(opt mountIndexOptions) (desync.Store, error) {
 		}
 		stores, cache, err = readStoreFile(opt.storeFile)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to read store-file '%s'", err)
+			return nil, errors.Wrapf(err, "failed to read store-file '%s'", opt.storeFile)
 		}
 	}
 

cmd/desync/prune.go

@@ -85,7 +85,9 @@ func runPrune(ctx context.Context, opt pruneOptions, args []string) error {
 		for {
 			var a string
 			fmt.Printf("[y/N]: ")
-			fmt.Fscanln(os.Stdin, &a)
+			if _, err := fmt.Fscanln(os.Stdin, &a); err != nil {
+				return err
+			}
 			switch a {
 			case "y", "Y":
 				break ask

cmd/desync/store.go

@@ -257,7 +257,7 @@ func indexStoreFromLocation(location string, cmdOpt cmdStoreOptions) (desync.Ind
 			lookup = minio.BucketLookupPath
 		case "", "auto":
 		default:
-			return nil, "", fmt.Errorf("unknown S3 bucket lookup type: %q", s)
+			return nil, "", fmt.Errorf("unknown S3 bucket lookup type: %q", ls)
 		}
 		s, err = desync.NewS3IndexStore(&p, s3Creds, region, opt, lookup)
 		if err != nil {

cmd/desync/verifyindex_test.go

@@ -15,7 +15,6 @@ func TestVerifyIndexCommand(t *testing.T) {
 	stderr = b
 	_, err := verifyIndex.ExecuteC()
 	require.NoError(t, err)
-	require.Contains(t, b.String(), "")
 
 	// Do the same for blob2
 	verifyIndex = newVerifyIndexCommand(context.Background())
@@ -24,7 +23,6 @@ func TestVerifyIndexCommand(t *testing.T) {
 	stderr = b
 	_, err = verifyIndex.ExecuteC()
 	require.NoError(t, err)
-	require.Contains(t, b.String(), "")
 
 	// Run again against the wrong blob
 	verifyIndex = newVerifyIndexCommand(context.Background())