feat(vimport): Use 2 ports & expanded error message

Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>

internal/cli/kraft/cloud/volume/import/cpio.go

@@ -9,6 +9,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"encoding/binary"
 	"errors"
 	"fmt"
 	"io"
@@ -21,6 +22,21 @@ import (
 	"kraftkit.sh/internal/cpio"
 )
 
+type okResponse struct {
+	status  int32
+	message []byte
+}
+
+func (r *okResponse) Parse(resp []byte) okResponse {
+	err := binary.Read(bytes.NewReader(resp[:4]), binary.LittleEndian, r)
+	if err != nil {
+		return okResponse{}
+	}
+	r.message = resp[4:]
+
+	return r
+}
+
 // buildCPIO generates a CPIO archive from the data at the given source.
 func buildCPIO(ctx context.Context, source string) (path string, size int64, err error) {
 	if source == "." {
@@ -48,8 +64,9 @@ func buildCPIO(ctx context.Context, source string) (path string, size int64, err
 }
 
 // copyCPIO copies the CPIO archive at the given path over the provided tls.Conn.
-func copyCPIO(ctx context.Context, conn *tls.Conn, auth, path string, size int64, callback progressCallbackFunc) error {
-	var errno []byte = []byte{0}
+func copyCPIO(ctx context.Context, conn *tls.Conn, rconn *tls.Conn, auth, path string, size int64, callback progressCallbackFunc) error {
+	var respRaw []byte
+	var resp okResponse
 
 	f, err := os.Open(path)
 	if err != nil {
@@ -61,25 +78,26 @@ func copyCPIO(ctx context.Context, conn *tls.Conn, auth, path string, size int64
 	// cancelled, because the deadline applies to all future and pending I/O and
 	// can be dynamically extended or reduced.
 	_ = conn.SetWriteDeadline(noNetTimeout)
-	_ = conn.SetReadDeadline(noNetTimeout)
+	_ = rconn.SetReadDeadline(noNetTimeout)
 	go func() {
 		<-ctx.Done()
 		_ = conn.SetWriteDeadline(immediateNetCancel)
-		_ = conn.SetReadDeadline(immediateNetCancel)
+		_ = rconn.SetReadDeadline(immediateNetCancel)
 	}()
 
 	if _, err = io.Copy(conn, strings.NewReader(auth)); err != nil {
 		return err
 	}
 
 	// Wait for OK
-	_, err = io.ReadFull(conn, errno)
+	respRaw, err = io.ReadAll(rconn)
 	if err != nil {
 		return err
 	}
 
-	if errno[0] != 0 {
-		return fmt.Errorf("authentication failed (code %d)", errno[0])
+	resp.Parse(respRaw)
+	if resp.status != 0 {
+		return fmt.Errorf("authentication failed: %s", resp.message)
 	}
 
 	fi, err := os.Open(path)
@@ -109,13 +127,14 @@ func copyCPIO(ctx context.Context, conn *tls.Conn, auth, path string, size int64
 		}
 
 		// Wait for OK
-		_, err = io.ReadFull(conn, errno)
+		respRaw, err = io.ReadAll(rconn)
 		if err != nil {
 			return err
 		}
 
-		if errno[0] != 0 {
-			return fmt.Errorf("name copy failed (code %d)", errno[0])
+		resp.Parse(respRaw)
+		if resp.status != 0 {
+			return fmt.Errorf("header copy failed: %s", resp.message)
 		}
 
 		// io.Copy the file name
@@ -125,13 +144,14 @@ func copyCPIO(ctx context.Context, conn *tls.Conn, auth, path string, size int64
 		}
 
 		// Wait for OK
-		_, err = io.ReadFull(conn, errno)
+		respRaw, err = io.ReadAll(rconn)
 		if err != nil {
 			return err
 		}
 
-		if errno[0] != 0 {
-			return fmt.Errorf("name copy failed (code %d)", errno[0])
+		resp.Parse(respRaw)
+		if resp.status != 0 {
+			return fmt.Errorf("name copy failed: %s", resp.message)
 		}
 
 		// io.Copy the file content
@@ -156,13 +176,14 @@ func copyCPIO(ctx context.Context, conn *tls.Conn, auth, path string, size int64
 		// Don't wait for ok if nothing was written
 		if totalCopy != 0 {
 			// Wait for OK
-			_, err = io.ReadFull(conn, errno)
+			respRaw, err = io.ReadAll(rconn)
 			if err != nil {
 				return err
 			}
 
-			if errno[0] != 0 {
-				return fmt.Errorf("file copy failed (code %d)", errno[0])
+			resp.Parse(respRaw)
+			if resp.status != 0 {
+				return fmt.Errorf("file copy failed: %s", resp.message)
 			}
 		}
 	}

internal/cli/kraft/cloud/volume/import/import.go

@@ -39,7 +39,10 @@ type ImportOptions struct {
 	VolID  string `local:"true" long:"volume" short:"v" usage:"Identifier of an existing volume (name or UUID)"`
 }
 
-const volimportPort uint16 = 42069
+const (
+	volimportPort     uint16 = 42069
+	volimportPortRecv uint16 = 42070
+)
 
 func NewCmd() *cobra.Command {
 	cmd, err := cmdfactory.New(&ImportOptions{}, cobra.Command{
@@ -169,15 +172,24 @@ func importVolumeData(ctx context.Context, opts *ImportOptions) (retErr error) {
 			instAddr := instFQDN + ":" + strconv.FormatUint(uint64(volimportPort), 10)
 			conn, err := tls.Dial("tcp4", instAddr, nil)
 			if err != nil {
-				return fmt.Errorf("connecting to volume data import instance: %w", err)
+				return fmt.Errorf("connecting to volume data import instance send port: %w", err)
 			}
 			defer func() {
 				retErr = errors.Join(retErr, conn.Close())
 			}()
 
+			instAddrRecv := instFQDN + ":" + strconv.FormatUint(uint64(volimportPortRecv), 10)
+			rconn, err := tls.Dial("tcp4", instAddr, nil)
+			if err != nil {
+				return fmt.Errorf("connecting to volume data import instance receive port: %w", err)
+			}
+			defer func() {
+				retErr = errors.Join(retErr, rconn.Close())
+			}()
+
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
-			err = copyCPIO(ctx, conn, authStr, cpioPath, cpioSize, callback)
+			err = copyCPIO(ctx, conn, rconn, authStr, cpioPath, cpioSize, callback)
 			copyCPIOErr = err
 			return err
 		},

internal/cli/kraft/cloud/volume/import/volimport.go

@@ -43,14 +43,21 @@ func runVolimport(ctx context.Context, cli kcinstances.InstancesService, volUUID
 		MemoryMB: ptr(32),
 		Args: []string{
 			"-p", strconv.FormatUint(uint64(volimportPort), 10),
+			"-p", strconv.FormatUint(uint64(volimportPortRecv), 10),
 			"-a", authStr,
 		},
 		ServiceGroup: &kcinstances.CreateRequestServiceGroup{
 			Services: []kcservices.CreateRequestService{{
 				Port:            int(volimportPort),
 				DestinationPort: ptr(int(volimportPort)),
 				Handlers:        []kcservices.Handler{kcservices.HandlerTLS},
-			}},
+			},
+			{
+				Port:            int(volimportPortRecv),
+				DestinationPort: ptr(int(volimportPortRecv)),
+				Handlers:        []kcservices.Handler{kcservices.HandlerTLS},
+			},
+		},
 		},
 		Volumes: []kcinstances.CreateRequestVolume{{
 			UUID: &volUUID,