improve airbyte command handling

Author: kamushadenes

pkg/providers/airbyte/storage.go

@@ -313,7 +313,7 @@ func (a *Storage) writeFile(fileName, fileData string) error {
 	return os.WriteFile(
 		fullPath,
 		[]byte(fileData),
-		0664,
+		0o664,
 	)
 }
 
@@ -411,43 +411,67 @@ func (a *Storage) runRawCommand(args ...string) (io.Reader, io.Reader, error) {
 	return a.cw.Run(ctx, opts)
 }
 
+// safeReadFrom safely reads from an io.Reader into a buffer using defer/recover to handle panics
+// Returns the number of bytes read and any error that occurred during reading
+func safeReadFrom(dst *bytes.Buffer, src io.Reader) (n int64, err error) {
+	// Use defer/recover to catch any panics that might occur during ReadFrom
+	defer func() {
+		if r := recover(); r != nil {
+			err = xerrors.Errorf("panic during read: %v", r)
+		}
+	}()
+
+	// Only attempt to read if source is not nil
+	if src == nil {
+		return 0, nil
+	}
+
+	return dst.ReadFrom(src)
+}
+
 func (a *Storage) runCommand(args ...string) ([]byte, error) {
-	outReader, errReader, err := a.runRawCommand(args...)
+	outReader, errReader, cmdErr := a.runRawCommand(args...)
 
 	outBuf := new(bytes.Buffer)
 	errBuf := new(bytes.Buffer)
 
-	if outReader != nil {
-		if _, err := outBuf.ReadFrom(outReader); err != nil {
-			return nil, xerrors.Errorf("failed to read stdout: %w", err)
-		}
-	}
+	// Safely read from stdout
+	_, outReadErr := safeReadFrom(outBuf, outReader)
 
-	if errReader != nil {
-		if _, err := errBuf.ReadFrom(outReader); err != nil {
-			return nil, xerrors.Errorf("failed to read stdout: %w", err)
-		}
-	}
+	// Safely read from stderr
+	_, errReadErr := safeReadFrom(errBuf, errReader)
 
-	if err != nil {
-		// TODO: duplicated code
+	// Log command details if there was an error with the command execution
+	if cmdErr != nil {
 		opts := a.baseOpts()
 		opts.Command = args
 
 		a.logger.Errorf("command: %s stdout:\n%s", opts.String(), outBuf.String())
 		a.logger.Errorf("command: %s stderr:\n%s", opts.String(), errBuf.String())
 
-		return nil, xerrors.Errorf("failed: %w", err)
+		return nil, xerrors.Errorf("command failed: %w", cmdErr)
+	}
+
+	if outReadErr != nil {
+		return nil, xerrors.Errorf("failed to read stdout: %w", outReadErr)
 	}
 
-	scr := bufio.NewScanner(errReader)
-	var errs util.Errors
-	for scr.Scan() {
-		errs = append(errs, xerrors.New(scr.Text()))
+	if errReadErr != nil {
+		return nil, xerrors.Errorf("failed to read stderr: %w", errReadErr)
 	}
-	if len(errs) > 0 {
-		a.logger.Warnf("stderr: %v", log.Error(errs))
+
+	// Scan the captured errBuf for stderr messages
+	if errBuf.Len() > 0 {
+		scanner := bufio.NewScanner(bytes.NewReader(errBuf.Bytes()))
+		var errs util.Errors
+		for scanner.Scan() {
+			errs = append(errs, xerrors.New(scanner.Text()))
+		}
+		if len(errs) > 0 {
+			a.logger.Warnf("stderr: %v", log.Error(errs))
+		}
 	}
+
 	return outBuf.Bytes(), nil
 }